Skip to content

Commit a39c979

Browse files
committed
Fixing PostgreSQL issue
1 parent ae1488f commit a39c979

File tree

5 files changed

+97
-94
lines changed

5 files changed

+97
-94
lines changed

src/QueryFactory/AbstractQueryFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ protected function getColumnsList(string $mainTable, array $additionalTablesFetc
189189
'tableGroup' => $tableGroups[$table],
190190
];
191191
$columnsList[] = $mysqlPlatform->quoteIdentifier($table).'.'.$mysqlPlatform->quoteIdentifier($columnName).' as '.
192-
$connection->quoteIdentifier($table.'____'.$columnName);
192+
$mysqlPlatform->quoteIdentifier($table.'____'.$columnName);
193193
}
194194
}
195195

src/QueryFactory/FindObjectsQueryFactory.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ protected function compute(): void
4747
$sql = 'SELECT DISTINCT '.implode(', ', $columnsList).' FROM MAGICJOIN('.$this->mainTable.')';
4848

4949
$pkColumnNames = $this->tdbmService->getPrimaryKeyColumns($this->mainTable);
50-
$pkColumnNames = array_map(function ($pkColumn) {
51-
return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
50+
$mysqlPlatform = new MySqlPlatform();
51+
$pkColumnNames = array_map(function ($pkColumn) use ($mysqlPlatform) {
52+
return $mysqlPlatform->quoteIdentifier($this->mainTable).'.'.$mysqlPlatform->quoteIdentifier($pkColumn);
5253
}, $pkColumnNames);
5354

5455
$subQuery = 'SELECT DISTINCT '.implode(', ', $pkColumnNames).' FROM MAGICJOIN('.$this->mainTable.')';

src/ResultIterator.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace TheCodingMachine\TDBM;
55

6+
use Doctrine\DBAL\Platforms\MySqlPlatform;
67
use Psr\Log\NullLogger;
78
use function array_map;
89
use Doctrine\DBAL\Connection;
@@ -371,7 +372,8 @@ public function _getSubQuery(): string
371372

372373
$pkDesc = array_pop($primaryKeyColumnDescs);
373374

374-
$sql = $this->tdbmService->getConnection()->quoteIdentifier($pkDesc['table']).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkDesc['column']).' IN ('.$sql.')';
375+
$mysqlPlatform = new MySqlPlatform();
376+
$sql = $mysqlPlatform->quoteIdentifier($pkDesc['table']).'.'.$mysqlPlatform->quoteIdentifier($pkDesc['column']).' IN ('.$sql.')';
375377

376378
return $sql;
377379
}

vendor-bin/couscous/composer.lock

Lines changed: 68 additions & 68 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)