[2386] SqlServerAdapter::getColumns returns non-associative array

Author: lutdev

src/Phinx/Db/Adapter/AdapterInterface.php

@@ -428,7 +428,7 @@ public function truncateTable(string $tableName): void;
      * Returns table columns
      *
      * @param string $tableName Table name
-     * @return \Phinx\Db\Table\Column[]
+     * @return list<\Phinx\Db\Table\Column>
      */
     public function getColumns(string $tableName): array;
 

src/Phinx/Db/Adapter/SqlServerAdapter.php

@@ -487,7 +487,7 @@ public function getColumns(string $tableName): array
                 $column->setPrecision((int)$columnInfo['precision']);
             }
 
-            $columns[$columnInfo['name']] = $column;
+            $columns[] = $column;
         }
 
         return $columns;
@@ -626,10 +626,10 @@ protected function getChangeDefault(string $tableName, Column $newColumn): Alter
      */
     protected function getChangeColumnInstructions(string $tableName, string $columnName, Column $newColumn): AlterInstructions
     {
-        $columns = $this->getColumns($tableName);
+        $column = $this->getColumn($tableName, $columnName);
         $changeDefault =
-            $newColumn->getDefault() !== $columns[$columnName]->getDefault() ||
-            $newColumn->getType() !== $columns[$columnName]->getType();
+            $newColumn->getDefault() !== $column?->getDefault() ||
+            $newColumn->getType() !== $column?->getType();
 
         $instructions = new AlterInstructions();
 
@@ -1382,4 +1382,25 @@ public function getDecoratedConnection(): Connection
 
         return $this->decoratedConnection = $this->buildConnection(SqlServerDriver::class, $options);
     }
+
+    /**
+     * Gets a table column
+     *
+     * @param string $tableName
+     * @param string $columnName
+     * @return \Phinx\Db\Table\Column|null
+     */
+    private function getColumn(string $tableName, string $columnName): ?Column
+    {
+        $columns = $this->getColumns($tableName);
+
+        $filteredColumns = array_filter(
+            $columns,
+            static function ($column) use ($columnName) {
+                return $column->getName() === $columnName;
+            },
+        );
+
+        return array_pop($filteredColumns);
+    }
 }

tests/Phinx/Db/Adapter/SqlServerAdapterTest.php

@@ -691,7 +691,7 @@ public function testDropColumn()
         $this->assertFalse($this->adapter->hasColumn('t', 'column1'));
     }
 
-    public function columnsProvider()
+    public static function columnsProvider(): array
     {
         return [
             ['column1', 'string', ['null' => true, 'default' => null]],
@@ -718,7 +718,7 @@ public function columnsProvider()
     /**
      * @dataProvider columnsProvider
      */
-    public function testGetColumns($colName, $type, $options)
+    public function testGetColumns($colName, $type, $options): void
     {
         $table = new Table('t', [], $this->adapter);
         $table
@@ -727,19 +727,23 @@ public function testGetColumns($colName, $type, $options)
 
         $columns = $this->adapter->getColumns('t');
         $this->assertCount(2, $columns);
-        $this->assertEquals($colName, $columns[$colName]->getName());
-        $this->assertEquals($type, $columns[$colName]->getType());
+
+        $specificColumn = $this->getColumn('t', $colName);
+        $this->assertNotNull($specificColumn);
+
+        $this->assertEquals($colName, $specificColumn->getName());
+        $this->assertEquals($type, $specificColumn->getType());
 
         if (isset($options['limit'])) {
-            $this->assertEquals($options['limit'], $columns[$colName]->getLimit());
+            $this->assertEquals($options['limit'], $specificColumn->getLimit());
         }
 
         if (isset($options['precision'])) {
-            $this->assertEquals($options['precision'], $columns[$colName]->getPrecision());
+            $this->assertEquals($options['precision'], $specificColumn->getPrecision());
         }
 
         if (isset($options['scale'])) {
-            $this->assertEquals($options['scale'], $columns[$colName]->getScale());
+            $this->assertEquals($options['scale'], $specificColumn->getScale());
         }
     }
 
@@ -1663,4 +1667,18 @@ public function testInvalidPdoAttribute($attribute)
         $this->expectExceptionMessage('Invalid PDO attribute: ' . $attribute . ' (\PDO::' . strtoupper($attribute) . ')');
         $adapter->connect();
     }
+
+    private function getColumn(string $tableName, string $columnName): ?Column
+    {
+        $columns = $this->adapter->getColumns($tableName);
+
+        $filteredColumns = array_filter(
+            $columns,
+            static function ($column) use ($columnName) {
+                return $column->getName() === $columnName;
+            },
+        );
+
+        return array_pop($filteredColumns);
+    }
 }