@@ -11,7 +11,7 @@ |
||
11 | 11 | |
12 | 12 | interface RelationshipsInterface |
13 | 13 | { |
14 | - public function joinClause(); |
|
14 | + public function joinClause(); |
|
15 | 15 | |
16 | 16 | public function whereClause($data, $condition); |
17 | 17 | } |
18 | 18 | \ No newline at end of file |
@@ -25,36 +25,36 @@ |
||
25 | 25 | $i = 0; |
26 | 26 | |
27 | 27 | if ($data[0]->REFERENCED_TABLE_NAME !== null) { |
28 | - $arraySize = count($data); |
|
29 | - |
|
30 | - foreach($data as $key => $value) { |
|
31 | - $output .= ' JOIN '.$value->REFERENCED_TABLE_NAME; |
|
32 | - } |
|
33 | - foreach($data as $key => $value) { |
|
34 | - $i++; |
|
35 | - $whereAnd = $i > 1 ? 'AND' : 'WHERE'; |
|
36 | - $output .= ' '.$whereAnd.' '.self::getTableName($connection).'.'.$value->COLUMN_NAME.'='.$value->REFERENCED_TABLE_NAME.'.'.$value->REFERENCED_COLUMN_NAME.' '; |
|
37 | - } |
|
38 | - } else { |
|
39 | - $output = false; |
|
40 | - } |
|
28 | + $arraySize = count($data); |
|
29 | + |
|
30 | + foreach($data as $key => $value) { |
|
31 | + $output .= ' JOIN '.$value->REFERENCED_TABLE_NAME; |
|
32 | + } |
|
33 | + foreach($data as $key => $value) { |
|
34 | + $i++; |
|
35 | + $whereAnd = $i > 1 ? 'AND' : 'WHERE'; |
|
36 | + $output .= ' '.$whereAnd.' '.self::getTableName($connection).'.'.$value->COLUMN_NAME.'='.$value->REFERENCED_TABLE_NAME.'.'.$value->REFERENCED_COLUMN_NAME.' '; |
|
37 | + } |
|
38 | + } else { |
|
39 | + $output = false; |
|
40 | + } |
|
41 | 41 | return $output; |
42 | 42 | } |
43 | 43 | |
44 | 44 | public function whereClause($data = null, $condition = null, $con = null) |
45 | 45 | { |
46 | - $joinClause = self::joinClause(); |
|
46 | + $joinClause = self::joinClause(); |
|
47 | 47 | $connection = self::checkConnection($con); |
48 | 48 | $tableName = self::getTableName($connection); |
49 | 49 | $columnName = self::whereAndClause($tableName, $data, $condition); |
50 | 50 | |
51 | - $query = 'SELECT * FROM '.$tableName; |
|
51 | + $query = 'SELECT * FROM '.$tableName; |
|
52 | 52 | |
53 | - if (! $joinClause) { |
|
54 | - $query .= ' WHERE '.$columnName; |
|
55 | - } else { |
|
56 | - $query .= ($data === null) ? $joinClause : $joinClause .' AND '.$columnName; |
|
57 | - } |
|
58 | - return $query; |
|
53 | + if (! $joinClause) { |
|
54 | + $query .= ' WHERE '.$columnName; |
|
55 | + } else { |
|
56 | + $query .= ($data === null) ? $joinClause : $joinClause .' AND '.$columnName; |
|
57 | + } |
|
58 | + return $query; |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | \ No newline at end of file |