Merge pull request #86 from Fooriva/4.0

Fix select table.* columns order
thecodingmachine · Apr 27, 2016 · 342c0a3 · 342c0a3
2 parents 9dcf2a5 + 6bab21f
commit 342c0a3
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/src/Mouf/Database/TDBM/TDBMService.php b/src/Mouf/Database/TDBM/TDBMService.php
@@ -1337,24 +1337,26 @@ public function findObjectsFromSql($mainTable, $from, $filter = null, array $par
 
         $allFetchedTables = $this->_getRelatedTablesByInheritance($mainTable);
 
-        $sql = 'SELECT DISTINCT '.$this->connection->quoteIdentifier($mainTable).'.* FROM '.$from;
+        $columnDescList = [];
+        $schema = $this->tdbmSchemaAnalyzer->getSchema();
+        $tableGroupName = $this->getTableGroupName($allFetchedTables);
 
-        if (count($allFetchedTables) === 1) {
-            $columnDescList = [];
-            $schema = $this->tdbmSchemaAnalyzer->getSchema();
-            $tableGroupName = $this->getTableGroupName($allFetchedTables);
+        foreach ($schema->getTable($mainTable)->getColumns() as $column) {
+            $columnName = $column->getName();
+            $columnDescList[] = [
+                'as' => $columnName,
+                'table' => $mainTable,
+                'column' => $columnName,
+                'type' => $column->getType(),
+                'tableGroup' => $tableGroupName,
+            ];
+        }
 
-            foreach ($schema->getTable($mainTable)->getColumns() as $column) {
-                $columnName = $column->getName();
-                $columnDescList[] = [
-                    'as' => $columnName,
-                    'table' => $mainTable,
-                    'column' => $columnName,
-                    'type' => $column->getType(),
-                    'tableGroup' => $tableGroupName,
-                ];
-            }
-        } else {
+        $sql = 'SELECT DISTINCT '.implode(', ', array_map(function($columnDesc) use ($mainTable) {
+                    return $this->connection->quoteIdentifier($mainTable).'.'.$this->connection->quoteIdentifier($columnDesc['column']);
+            }, $columnDescList)) .' FROM '.$from;
+
+        if (count($allFetchedTables) > 1) {
             list($columnDescList, $columnsList) = $this->getColumnsList($mainTable, []);
         }