| 1 | Index: query.py
|
|---|
| 2 | ===================================================================
|
|---|
| 3 | --- query.py (revision 11585)
|
|---|
| 4 | +++ query.py (working copy)
|
|---|
| 5 | @@ -425,8 +425,9 @@
|
|---|
| 6 | else:
|
|---|
| 7 | result.append('AND')
|
|---|
| 8 | result.append(' AND '.join(self.extra_where))
|
|---|
| 9 | -
|
|---|
| 10 | - grouping, gb_params = self.get_grouping()
|
|---|
| 11 | + params.extend(self.extra_params)
|
|---|
| 12 | +
|
|---|
| 13 | + grouping, gb_params = self.get_grouping()
|
|---|
| 14 | if grouping:
|
|---|
| 15 | if ordering:
|
|---|
| 16 | # If the backend can't group by PK (i.e., any database
|
|---|
| 17 | @@ -459,7 +460,6 @@
|
|---|
| 18 | result.append('LIMIT %d' % val)
|
|---|
| 19 | result.append('OFFSET %d' % self.low_mark)
|
|---|
| 20 |
|
|---|
| 21 | - params.extend(self.extra_params)
|
|---|
| 22 | return ' '.join(result), tuple(params)
|
|---|
| 23 |
|
|---|
| 24 | def as_nested_sql(self):
|
|---|