Add tests and fix

yiisoft · Sep 14, 2023 · a0dd827 · a0dd827
1 parent 8ddc69d
commit a0dd827
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/src/Schema.php b/src/Schema.php
@@ -731,12 +731,10 @@ protected function findColumns(TableSchemaInterface $table): bool
             LEFT JOIN pg_namespace d ON d.oid = c.relnamespace
             LEFT JOIN pg_rewrite rw ON c.relkind = 'v' AND rw.ev_class = c.oid AND rw.rulename = '_RETURN'
             LEFT JOIN pg_constraint ct ON ct.conrelid = c.oid AND ct.contype = 'p' AND a.attnum = ANY (ct.conkey)
-                OR rw.ev_action IS NOT NULL
-                AND (ARRAY(SELECT regexp_matches(
-                    rw.ev_action,
-                    '{TARGETENTRY .*? :resorigtbl ' || ct.conrelid || ' :resorigcol (\d+) ',
-                    'g'
-                )))[a.attnum][1]::smallint = ANY (ct.conkey)
+                OR rw.ev_action IS NOT NULL AND ct.contype = 'p'
+                AND (ARRAY(
+                    SELECT regexp_matches(rw.ev_action, '{TARGETENTRY .*? :resorigtbl (\d+) :resorigcol (\d+) ', 'g')
+                ))[a.attnum:a.attnum] <@ (ct.conrelid || ct.conkey)::text[]
         WHERE
             a.attnum > 0 AND t.typname != '' AND NOT a.attisdropped
             AND c.relname = :tableName
@@ -919,15 +917,14 @@ private function loadTableConstraints(string $tableName, string $returnType): ar
             ON "tcns"."oid" = "tc"."relnamespace"
         INNER JOIN "pg_attribute" AS "a"
             ON "a"."attrelid" = "tc"."oid"
-        LEFT JOIN pg_rewrite AS rw ON tc.relkind = 'v' AND rw.ev_class = tc.oid AND rw.rulename = '_RETURN'
+        LEFT JOIN pg_rewrite AS rw
+            ON "tc"."relkind" = 'v' AND "rw"."ev_class" = "tc"."oid" AND "rw"."rulename" = '_RETURN'
         INNER JOIN "pg_constraint" AS "c"
             ON "c"."conrelid" = "tc"."oid" AND "a"."attnum" = ANY ("c"."conkey")
-                OR rw.ev_action IS NOT NULL
-                AND (ARRAY(SELECT regexp_matches(
-                    rw.ev_action,
-                    '{TARGETENTRY .*? :resorigtbl ' || c.conrelid || ' :resorigcol (\d+) ',
-                    'g'
-                )))[a.attnum][1]::smallint = ANY (c.conkey)
+                OR "rw"."ev_action" IS NOT NULL AND "c"."conrelid" != 0
+                AND (ARRAY(
+                    SELECT regexp_matches("rw"."ev_action", '{TARGETENTRY .*? :resorigtbl (\d+) :resorigcol (\d+) ', 'g')
+                ))["a"."attnum":"a"."attnum"] <@ ("c"."conrelid" || "c"."conkey")::text[]
         LEFT JOIN "pg_class" AS "ftc"
             ON "ftc"."oid" = "c"."confrelid"
         LEFT JOIN "pg_namespace" AS "ftcns"

diff --git a/tests/ColumnSchemaTest.php b/tests/ColumnSchemaTest.php
@@ -202,8 +202,12 @@ public function testPrimaryKeyOfView()
     {
         $db = $this->getConnection(true);
         $schema = $db->getSchema();
-        $tableSchema = $schema->getTableSchema('animal_view');
+        $tableSchema = $schema->getTableSchema('T_constraints_2_view');
 
-        $this->assertTrue($tableSchema->getColumn('id')->isPrimaryKey());
+        $this->assertTrue($tableSchema->getColumn('C_id_1')->isPrimaryKey());
+        $this->assertTrue($tableSchema->getColumn('C_id_2')->isPrimaryKey());
+        $this->assertFalse($tableSchema->getColumn('C_index_1')->isPrimaryKey());
+        $this->assertFalse($tableSchema->getColumn('C_index_2_1')->isPrimaryKey());
+        $this->assertFalse($tableSchema->getColumn('C_index_2_2')->isPrimaryKey());
     }
 }
diff --git a/tests/Support/Fixture/pgsql.sql b/tests/Support/Fixture/pgsql.sql
@@ -417,10 +417,10 @@ CREATE TABLE "T_constraints_6"
     CONSTRAINT "CN_constraints_6" FOREIGN KEY ("C_fk_id_1", "C_fk_id_2") REFERENCES "schema1"."T_constraints_5" ("C_id_1", "C_id_2") ON DELETE CASCADE ON UPDATE CASCADE
 );
 
-CREATE VIEW "T_constraints_1_view" AS SELECT * FROM "T_constraints_1";
-CREATE VIEW "T_constraints_2_view" AS SELECT * FROM "T_constraints_2";
-CREATE VIEW "T_constraints_3_view" AS SELECT * FROM "T_constraints_3";
-CREATE VIEW "T_constraints_4_view" AS SELECT * FROM "T_constraints_4";
+CREATE VIEW "T_constraints_1_view" AS SELECT 'first_value', * FROM "T_constraints_1";
+CREATE VIEW "T_constraints_2_view" AS SELECT 'first_value', * FROM "T_constraints_2";
+CREATE VIEW "T_constraints_3_view" AS SELECT 'first_value', * FROM "T_constraints_3";
+CREATE VIEW "T_constraints_4_view" AS SELECT 'first_value', * FROM "T_constraints_4";
 
 CREATE TABLE "T_upsert"
 (