........ more fixes :(

Nik Barham · Nik Barham · commit 2cae067c79d1 · 2015-09-30T10:23:05.000Z
diff --git a/src/Automatorm/Orm/Data.php b/src/Automatorm/Orm/Data.php
@@ -383,7 +383,12 @@ public function join($var, array $where = [])
             $clauses = [];
             if ($where) foreach ($where as $clause_column => $clause_value)
             {
-                $clauses['`pivotjoin`.`' . $clause_column . '`'] = $clause_value;
+                // Rewrite $where clauses to insert `pivotjoin` table in column name
+                preg_match('/^([!=<>]*)([^!=<>]+)([!=<>]*)$/', $clause_column, $parts);
+                $prefix = $parts[1] ?: $parts[3];
+                $clause_column = $parts[2];
+                
+                $clauses['`pivotjoin`.`' . $clause_column . '`' . $prefix] = $clause_value;
             }
             
             $query->select(

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,12 @@ public function join($var, array $where = [])`
`383`	`383`	`$clauses = [];`
`384`	`384`	`if ($where) foreach ($where as $clause_column => $clause_value)`
`385`	`385`	`{`
`386`		- $clauses['`pivotjoin`.`' . $clause_column . '`'] = $clause_value;
	`386`	+ // Rewrite $where clauses to insert `pivotjoin` table in column name
	`387`	`+ preg_match('/^([!=<>])([^!=<>]+)([!=<>])$/', $clause_column, $parts);`
	`388`	`+ $prefix = $parts[1] ?: $parts[3];`
	`389`	`+ $clause_column = $parts[2];`
	`390`	`+`
	`391`	+ $clauses['`pivotjoin`.`' . $clause_column . '`' . $prefix] = $clause_value;
`387`	`392`	`}`
`388`	`393`
`389`	`394`	`$query->select(`