Merge pull request #366 from KpuTuK/patch-1

avbdr · avbdr · commit b02ed32c5280 · 2015-11-24T23:36:56.000+01:00
Join: do not add 'on' if using() condition is used
diff --git a/MysqliDb.php b/MysqliDb.php
@@ -1225,7 +1225,9 @@ protected function _buildJoin()
                 $joinStr = $joinTable;
             }
 
-            $this->_query .= " " . $joinType . " JOIN " . $joinStr . " on " . $joinCondition;
+            $this->_query .= " " . $joinType . " JOIN " . $joinStr . 
+                (false === stripos('using', $joinCondition) ? " " : " on ") 
+                . $joinCondition;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1225,7 +1225,9 @@ protected function _buildJoin()`
`1225`	`1225`	`$joinStr = $joinTable;`
`1226`	`1226`	`}`
`1227`	`1227`
`1228`		`- $this->_query .= " " . $joinType . " JOIN " . $joinStr . " on " . $joinCondition;`
	`1228`	`+ $this->_query .= " " . $joinType . " JOIN " . $joinStr .`
	`1229`	`+ (false === stripos('using', $joinCondition) ? " " : " on ")`
	`1230`	`+ . $joinCondition;`
`1229`	`1231`	`}`
`1230`	`1232`	`}`
`1231`	`1233`