|
@@ -480,14 +480,14 @@ |
|
|
block discarded – undo |
|
480
|
480
|
private function getQuerySQL() |
|
481
|
481
|
{ |
|
482
|
482
|
$nl = "\n"; |
|
483
|
|
- $where_sql = $this->getWHERESQL(); /* pre-fills $index['sub_joins'] $index['constraints'] */ |
|
484
|
|
- $order_sql = $this->getORDERSQL(); /* pre-fills $index['sub_joins'] $index['constraints'] */ |
|
|
483
|
+ $where_sql = $this->getWHERESQL(); /* pre-fills $index['sub_joins'] $index['constraints'] */ |
|
|
484
|
+ $order_sql = $this->getORDERSQL(); /* pre-fills $index['sub_joins'] $index['constraints'] */ |
|
485
|
485
|
|
|
486
|
486
|
return ''.( |
|
487
|
487
|
$this->is_union_query |
|
488
|
488
|
? 'SELECT' |
|
489
|
489
|
: 'SELECT'.$this->getDistinctSQL()).$nl. |
|
490
|
|
- $this->getResultVarsSQL().$nl. /* fills $index['sub_joins'] */ |
|
|
490
|
+ $this->getResultVarsSQL().$nl./* fills $index['sub_joins'] */ |
|
491
|
491
|
$this->getFROMSQL(). |
|
492
|
492
|
$this->getAllJoinsSQL(). |
|
493
|
493
|
$this->getWHERESQL(). |
Please login to merge, or discard this patch.