Merge branch '8.x'

Author: taka-oyama

compose.yaml

@@ -8,4 +8,4 @@ services:
     depends_on:
       - emulator
   emulator:
-    image: "gcr.io/cloud-spanner-emulator/emulator:1.5.28"
+    image: "gcr.io/cloud-spanner-emulator/emulator:1.5.30"

src/Query/Grammar.php

@@ -65,7 +65,7 @@ public function compileInsertGetId(Builder $query, $values, $sequence)
      */
     protected function compileLock(Builder $query, $value)
     {
-        return '';
+        return $value === true ? 'for update' : '';
     }
 
     /**

src/Query/Processor.php

@@ -133,13 +133,21 @@ public function processColumns($results)
 
     /**
      * {@inheritDoc}
-     * @param array{ index_name: string }&array<string, mixed> $results
-     * @return array<array-key, string>
+     * @param list<array<string, mixed>> $results
+     * @return list<array{name: string, columns: list<string>, type: string, unique: bool, primary: bool}>
      */
     public function processIndexes($results)
     {
         return array_map(function ($result) {
-            return ((object) $result)->index_name;
+            $result = (object) $result;
+
+            return [
+                'name' => $name = $result->name,
+                'columns' => $result->columns ? explode(',', $result->columns) : [],
+                'type' => strtolower($result->type),
+                'unique' => (bool) $result->unique,
+                'primary' => $name === 'PRIMARY_KEY',
+            ];
         }, $results);
     }
 

src/Schema/Builder.php

@@ -145,7 +145,7 @@ public function dropAllTables()
         $queries = [];
         foreach ($sortedTables as $tableData) {
             $tableName = $tableData['name'];
-            $indexes = $this->getIndexes($tableName);
+            $indexes = $this->getIndexListing($tableName);
             $blueprint = $this->createBlueprint($tableName);
             foreach ($indexes as $index) {
                 if ($index === 'PRIMARY_KEY') {

src/Schema/Grammar.php

@@ -59,10 +59,20 @@ public function compileTables($schema)
      */
     public function compileIndexes($schema, $table)
     {
-        return sprintf(
-            'select index_name as `index_name` from information_schema.indexes where table_schema = \'\' and table_name = %s',
-            $this->quoteString($table),
-        );
+        return implode(' ', [
+            'select',
+            implode(', ', [
+                'i.index_name as `name`',
+                'string_agg(c.column_name, \',\') as `columns`',
+                'i.index_type as `type`',
+                'i.is_unique as `unique`',
+            ]),
+            'from information_schema.indexes as i',
+            'join information_schema.index_columns as c on i.table_schema = c.table_schema and i.table_name = c.table_name and i.index_name = c.index_name',
+            'where i.table_schema = ' . $this->quoteString(''),
+            'and i.table_name = ' . $this->quoteString($table),
+            'group by i.index_name, i.index_type, i.is_unique',
+        ]);
     }
 
     /**

tests/Query/BuilderTest.php

@@ -994,15 +994,15 @@ public function test_lock(): void
         $conn = $this->getDefaultConnection();
         $qb = $conn->table(self::TABLE_NAME_USER);
         $sql = $qb->lock()->toRawSql();
-        $this->assertSame('select * from `User`', $sql);
+        $this->assertSame('select * from `User` for update', $sql);
     }
 
     public function test_lockForUpdate(): void
     {
         $conn = $this->getDefaultConnection();
         $qb = $conn->table(self::TABLE_NAME_USER);
         $sql = $qb->lockForUpdate()->toRawSql();
-        $this->assertSame('select * from `User`', $sql);
+        $this->assertSame('select * from `User` for update', $sql);
     }
 
     public function test_sharedLock(): void

tests/Schema/BuilderTestLast.php

@@ -245,7 +245,7 @@ public function test_getColumns(): void
         ], Arr::first($sb->getColumns($table)));
     }
 
-    public function test_getAllTables(): void
+    public function test_getTableListing(): void
     {
         $conn = $this->getDefaultConnection();
         $sb = $conn->getSchemaBuilder();
@@ -256,14 +256,53 @@ public function test_getAllTables(): void
             $table->primary('id');
         });
 
-        /** @var array{ name: string, type: string } $row */
-        $row = Arr::first(
-            $sb->getTables(),
-            static fn(array $row): bool => $row['name'] === $table,
-        );
+        $this->assertContains($table, $sb->getTableListing());
+    }
 
-        $this->assertSame($table, $row['name']);
-        $this->assertSame('BASE TABLE', $row['type']);
+    public function test_getIndexes(): void
+    {
+        $conn = $this->getDefaultConnection();
+        $sb = $conn->getSchemaBuilder();
+        $table = $this->generateTableName(class_basename(__CLASS__));
+        $sb->create($table, function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->uuid('something');
+            $table->index('something');
+        });
+
+        $this->assertSame([
+            [
+                'name' => strtolower($table) . '_something_index',
+                'columns' => ['something'],
+                'type' => 'index',
+                'unique' => false,
+                'primary' => false,
+            ],
+            [
+                'name' => 'PRIMARY_KEY',
+                'columns' => ['id'],
+                'type' => 'primary_key',
+                'unique' => true,
+                'primary' => true,
+            ],
+        ], $sb->getIndexes($table));
+    }
+
+    public function test_getIndexListing(): void
+    {
+        $conn = $this->getDefaultConnection();
+        $sb = $conn->getSchemaBuilder();
+        $table = $this->generateTableName(class_basename(__CLASS__));
+        $sb->create($table, function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->uuid('something');
+            $table->index('something');
+        });
+
+        $this->assertSame([
+            strtolower($table) . '_something_index',
+            'PRIMARY_KEY',
+        ], $sb->getIndexListing($table));
     }
 
     public function test_dropAllTables(): void