fix: properly quote table names with schema definition #84 (#86)

Author: sabee-bb

.github/workflows/main.yml

@@ -41,7 +41,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
       postgres:
-        image: postgres
+        image: postgres:16.4
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: codeception_test

composer.json

@@ -22,6 +22,7 @@
         "codeception/codeception": "*@dev"
     },
     "require-dev": {
+        "behat/gherkin": "~4.10.0",
         "squizlabs/php_codesniffer": "*"
     },
     "conflict": {

docker-compose.yml

@@ -30,7 +30,7 @@ services:
       - "3306:3306"
 
   postgres:
-    image: postgres
+    image: postgres:16.4
     environment:
       POSTGRES_PASSWORD: codeception
       POSTGRES_DB: codeception

src/Codeception/Lib/Driver/PostgreSql.php

@@ -164,7 +164,7 @@ public function getPrimaryKey(string $tableName): array
                 FROM   pg_index i
                 JOIN   pg_attribute a ON a.attrelid = i.indrelid
                                      AND a.attnum = ANY(i.indkey)
-                WHERE  i.indrelid = '\"{$tableName}\"'::regclass
+                WHERE  i.indrelid = '" . $this->getQuotedName($tableName) . "'::regclass
                 AND    i.indisprimary";
             $stmt = $this->executeQuery($query, []);
             $columns = $stmt->fetchAll(PDO::FETCH_ASSOC);

tests/unit/Codeception/Module/Db/PostgreSqlDbTest.php

@@ -17,20 +17,20 @@ public function getConfig(): array
             $this->markTestSkipped();
         }
 
-        $host = getenv('PG_HOST') ?: 'localhost';
-        $user = getenv('PG_USER') ?: 'postgres';
+        $host     = getenv('PG_HOST') ?: 'localhost';
+        $user     = getenv('PG_USER') ?: 'postgres';
         $password = getenv('PG_PASSWORD') ?: null;
         $database = getenv('PG_DB') ?: 'codeception_test';
-        $dsn = getenv('PG_DSN') ?: 'pgsql:host=' . $host . ';dbname=' . $database;
+        $dsn      = getenv('PG_DSN') ?: 'pgsql:host=' . $host . ';dbname=' . $database;
 
         return [
-            'dsn' => $dsn,
-            'user' => $user,
-            'password' => $password,
-            'dump' => 'tests/data/dumps/postgres.sql',
+            'dsn'       => $dsn,
+            'user'      => $user,
+            'password'  => $password,
+            'dump'      => 'tests/data/dumps/postgres.sql',
             'reconnect' => true,
-            'cleanup' => true,
-            'populate' => true
+            'cleanup'   => true,
+            'populate'  => true,
         ];
     }
 
@@ -39,4 +39,12 @@ public function testHaveInDatabaseWithUppercaseTableName()
         $testData = ['Status' => 'test'];
         $this->module->haveInDatabase('NoPk', $testData);
     }
+
+    public function testHaveInDatabaseWithAnotherSchema()
+    {
+        $userId = $this->module->haveInDatabase('anotherschema.users', ['name' => 'anotherschema', 'email' => '[email protected]']);
+        $this->assertIsInt($userId);
+
+        $this->module->seeInDatabase('anotherschema.users', ['name' => 'anotherschema', 'email' => '[email protected]']);
+    }
 }