Fix getting columns when sql mode is using ansi_quotes (#669)

Co-authored-by: Markus Staab <maggus.staab@googlemail.com>
staabm · Aug 3, 2024 · 4962951 · 4962951
1 parent 8d845bf
commit 4962951
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/DbSchema/SchemaHasherMysql.php b/src/DbSchema/SchemaHasherMysql.php
@@ -39,7 +39,7 @@ public function hashDb(): string
         $maxConcatQuery = 'SET SESSION group_concat_max_len = 1000000';
         $this->connection->query($maxConcatQuery);
 
-        $query = '
+        $query = "
             SELECT
                 MD5(
                     GROUP_CONCAT(
@@ -50,8 +50,8 @@ public function hashDb(): string
             FROM (
                 SELECT
                     CONCAT(
-                        COALESCE(COLUMN_NAME, ""),
-                        COALESCE(EXTRA, ""),
+                        COALESCE(COLUMN_NAME, ''),
+                        COALESCE(EXTRA, ''),
                         COLUMN_TYPE,
                         IS_NULLABLE
                     ) as columns
@@ -62,7 +62,7 @@ public function hashDb(): string
                 ORDER BY table_name, column_name
             ) as InnerSelect
             GROUP BY
-                grouper';
+                grouper";
 
         $hash = '';
         if ($this->connection instanceof PDO) {

diff --git a/src/QueryReflection/PdoMysqlQueryReflector.php b/src/QueryReflection/PdoMysqlQueryReflector.php
@@ -99,12 +99,12 @@ protected function checkInformationSchema(string $tableName): Iterator
         if (null === $this->stmt) {
             $this->stmt = $this->pdo->prepare(
                 // EXTRA, COLUMN_NAME seems to be nullable in mariadb
-                'SELECT
-                    coalesce(COLUMN_NAME, "") as COLUMN_NAME,
-                    coalesce(EXTRA, "") as EXTRA,
+                "SELECT
+                    coalesce(COLUMN_NAME, '') as COLUMN_NAME,
+                    coalesce(EXTRA, '') as EXTRA,
                     COLUMN_TYPE
                  FROM information_schema.columns
-                 WHERE table_name = ? AND table_schema = DATABASE()'
+                 WHERE table_name = ? AND table_schema = DATABASE()"
             );
         }