Fix CI failures: add trailing commas and fix tests for missing pg_trgm extension

Author: dereuromark

tests/TestCase/Db/Adapter/PostgresAdapterTest.php

@@ -1495,14 +1495,16 @@ public function testDropIndexByNameWithSchema()
 
     public function testAddGistIndex(): void
     {
+        // GiST indexes on text columns require an operator class.
+        // We use inet type which has built-in GiST support.
         $table = new Table('table1', [], $this->adapter);
-        $table->addColumn('data', 'text')
+        $table->addColumn('ip_range', 'inet')
               ->save();
 
-        $table->addIndex('data', ['type' => 'gist', 'opclass' => ['data' => 'gist_trgm_ops']])
+        $table->addIndex('ip_range', ['type' => 'gist'])
               ->save();
 
-        $this->assertTrue($table->hasIndex('data'));
+        $this->assertTrue($table->hasIndex('ip_range'));
 
         // Verify the index uses the GIST access method
         $rows = $this->adapter->fetchAll(
@@ -1511,7 +1513,7 @@ public function testAddGistIndex(): void
              JOIN pg_class c ON c.oid = i.indexrelid
              JOIN pg_am am ON am.oid = c.relam
              JOIN pg_class t ON t.oid = i.indrelid
-             WHERE t.relname = 'table1' AND c.relname = 'table1_data'"
+             WHERE t.relname = 'table1' AND c.relname = 'table1_ip_range'",
         );
         $this->assertCount(1, $rows);
         $this->assertEquals('gist', $rows[0]['access_method']);
@@ -1535,7 +1537,7 @@ public function testAddGinIndex(): void
              JOIN pg_class c ON c.oid = i.indexrelid
              JOIN pg_am am ON am.oid = c.relam
              JOIN pg_class t ON t.oid = i.indrelid
-             WHERE t.relname = 'table1' AND c.relname = 'table1_tags'"
+             WHERE t.relname = 'table1' AND c.relname = 'table1_tags'",
         );
         $this->assertCount(1, $rows);
         $this->assertEquals('gin', $rows[0]['access_method']);
@@ -1559,7 +1561,7 @@ public function testAddBrinIndex(): void
              JOIN pg_class c ON c.oid = i.indexrelid
              JOIN pg_am am ON am.oid = c.relam
              JOIN pg_class t ON t.oid = i.indrelid
-             WHERE t.relname = 'table1' AND c.relname = 'table1_created_at'"
+             WHERE t.relname = 'table1' AND c.relname = 'table1_created_at'",
         );
         $this->assertCount(1, $rows);
         $this->assertEquals('brin', $rows[0]['access_method']);
@@ -1583,14 +1585,15 @@ public function testAddHashIndex(): void
              JOIN pg_class c ON c.oid = i.indexrelid
              JOIN pg_am am ON am.oid = c.relam
              JOIN pg_class t ON t.oid = i.indrelid
-             WHERE t.relname = 'table1' AND c.relname = 'table1_session_id'"
+             WHERE t.relname = 'table1' AND c.relname = 'table1_session_id'",
         );
         $this->assertCount(1, $rows);
         $this->assertEquals('hash', $rows[0]['access_method']);
     }
 
     public function testAddSpgistIndex(): void
     {
+        // SP-GiST indexes on text require the text_ops operator class
         $table = new Table('table1', [], $this->adapter);
         $table->addColumn('data', 'text')
               ->save();
@@ -1607,14 +1610,22 @@ public function testAddSpgistIndex(): void
              JOIN pg_class c ON c.oid = i.indexrelid
              JOIN pg_am am ON am.oid = c.relam
              JOIN pg_class t ON t.oid = i.indrelid
-             WHERE t.relname = 'table1' AND c.relname = 'table1_data'"
+             WHERE t.relname = 'table1' AND c.relname = 'table1_data'",
         );
         $this->assertCount(1, $rows);
         $this->assertEquals('spgist', $rows[0]['access_method']);
     }
 
     public function testAddIndexWithOpclass(): void
     {
+        // Test opclass with GiST using pg_trgm extension
+        // Skip if extension is not available
+        try {
+            $this->adapter->execute('CREATE EXTENSION IF NOT EXISTS pg_trgm');
+        } catch (\Exception $e) {
+            $this->markTestSkipped('pg_trgm extension is not available');
+        }
+
         $table = new Table('table1', [], $this->adapter);
         $table->addColumn('name', 'string')
               ->save();
@@ -1633,7 +1644,7 @@ public function testAddIndexWithOpclass(): void
              JOIN pg_class c ON c.oid = i.indexrelid
              JOIN pg_am am ON am.oid = c.relam
              JOIN pg_class t ON t.oid = i.indrelid
-             WHERE t.relname = 'table1' AND c.relname = 'table1_name'"
+             WHERE t.relname = 'table1' AND c.relname = 'table1_name'",
         );
         $this->assertCount(1, $rows);
         $this->assertEquals('gist', $rows[0]['access_method']);