@@ -35,9 +35,9 @@ |
||
35 | 35 | $whereAnd = $i > 1 ? 'AND' : 'WHERE'; |
36 | 36 | $output .= ' '.$whereAnd.' '.self::getTableName($connection).'.'.$value->COLUMN_NAME.'='.$value->REFERENCED_TABLE_NAME.'.'.$value->REFERENCED_COLUMN_NAME.' '; |
37 | 37 | } |
38 | - } else { |
|
38 | + } else { |
|
39 | 39 | $output = false; |
40 | - } |
|
40 | + } |
|
41 | 41 | return $output; |
42 | 42 | } |
43 | 43 |
@@ -24,13 +24,13 @@ discard block |
||
24 | 24 | $output = ""; |
25 | 25 | $i = 0; |
26 | 26 | |
27 | - if (! isset($data[0]) || $data[0]->REFERENCED_TABLE_NAME !== null) { |
|
28 | - $arraySize = count($data); |
|
27 | + if ( ! isset($data[0]) || $data[0]->REFERENCED_TABLE_NAME !== null) { |
|
28 | + $arraySize = count($data); |
|
29 | 29 | |
30 | - foreach($data as $key => $value) { |
|
30 | + foreach ($data as $key => $value) { |
|
31 | 31 | $output .= ' JOIN '.$value->REFERENCED_TABLE_NAME; |
32 | 32 | } |
33 | - foreach($data as $key => $value) { |
|
33 | + foreach ($data as $key => $value) { |
|
34 | 34 | $i++; |
35 | 35 | $whereAnd = $i > 1 ? 'AND' : 'WHERE'; |
36 | 36 | $output .= ' '.$whereAnd.' '.self::getTableName($connection).'.'.$value->COLUMN_NAME.'='.$value->REFERENCED_TABLE_NAME.'.'.$value->REFERENCED_COLUMN_NAME.' '; |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | } else if ($joinClause == false && $data !== null) { |
56 | 56 | $query .= ' WHERE '.$columnName; |
57 | 57 | } else { |
58 | - $query .= ($data === null) ? $joinClause : $joinClause .' AND '.$columnName; |
|
58 | + $query .= ($data === null) ? $joinClause : $joinClause.' AND '.$columnName; |
|
59 | 59 | } |
60 | 60 | return $query; |
61 | 61 | } |