|
@@ -55,19 +55,19 @@ discard block |
|
|
block discarded – undo |
|
55
|
55
|
]; |
|
56
|
56
|
} |
|
57
|
57
|
|
|
58
|
|
- $sql = 'SELECT DISTINCT '.implode(', ', array_map(function ($columnDesc) { |
|
|
58
|
+ $sql = 'SELECT DISTINCT '.implode(', ', array_map(function($columnDesc) { |
|
59
|
59
|
return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($columnDesc['column']); |
|
60
|
60
|
}, $columnDescList)).' FROM '.$this->from; |
|
61
|
61
|
|
|
62
|
|
- if (count($allFetchedTables) > 1) { |
|
|
62
|
+ if (count($allFetchedTables)>1) { |
|
63
|
63
|
list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy); |
|
64
|
64
|
} elseif ($this->orderBy) { |
|
65
|
|
- list(, , $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy); |
|
|
65
|
+ list(,, $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy); |
|
66
|
66
|
} |
|
67
|
67
|
|
|
68
|
68
|
// Let's compute the COUNT. |
|
69
|
69
|
$pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns(); |
|
70
|
|
- $pkColumnNames = array_map(function ($pkColumn) { |
|
|
70
|
+ $pkColumnNames = array_map(function($pkColumn) { |
|
71
|
71
|
return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn); |
|
72
|
72
|
}, $pkColumnNames); |
|
73
|
73
|
|
|
@@ -128,7 +128,7 @@ discard block |
|
|
block discarded – undo |
|
128
|
128
|
*/ |
|
129
|
129
|
private function getParentRelationshipForeignKeys($tableName) |
|
130
|
130
|
{ |
|
131
|
|
- return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function () use ($tableName) { |
|
|
131
|
+ return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function() use ($tableName) { |
|
132
|
132
|
return $this->getParentRelationshipForeignKeysWithoutCache($tableName); |
|
133
|
133
|
}); |
|
134
|
134
|
} |
|
@@ -157,7 +157,7 @@ discard block |
|
|
block discarded – undo |
|
157
|
157
|
*/ |
|
158
|
158
|
private function getChildrenRelationshipForeignKeys(string $tableName) : array |
|
159
|
159
|
{ |
|
160
|
|
- return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function () use ($tableName) { |
|
|
160
|
+ return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function() use ($tableName) { |
|
161
|
161
|
return $this->getChildrenRelationshipForeignKeysWithoutCache($tableName); |
|
162
|
162
|
}); |
|
163
|
163
|
} |
|
@@ -172,7 +172,7 @@ discard block |
|
|
block discarded – undo |
|
172
|
172
|
$children = $this->schemaAnalyzer->getChildrenRelationships($tableName); |
|
173
|
173
|
|
|
174
|
174
|
if (!empty($children)) { |
|
175
|
|
- $fksTables = array_map(function (ForeignKeyConstraint $fk) { |
|
|
175
|
+ $fksTables = array_map(function(ForeignKeyConstraint $fk) { |
|
176
|
176
|
return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName()); |
|
177
|
177
|
}, $children); |
|
178
|
178
|
|