Skip to content

Fix up SQLServer to return numeric array. #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markstory merged 2 commits into from
Nov 11, 2025
+23 −16
Merged

Fix up SQLServer to return numeric array. #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfad534
Fix up SQLServer to return numeric array.
dereuromark Nov 10, 2025
c1ded9b
Cleanup.
dereuromark Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/Db/Adapter/SqlserverAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ public function getColumns(string $tableName): array
$column->setIdentity($columnInfo['autoIncrement']);
}

$columns[$columnInfo['name']] = $column;
$columns[] = $column;
}

return $columns;
Expand Down Expand Up @@ -435,13 +435,20 @@ protected function getChangeDefault(string $tableName, Column $newColumn): Alter
protected function getChangeColumnInstructions(string $tableName, string $columnName, Column $newColumn): AlterInstructions
{
$columns = $this->getColumns($tableName);
if (!isset($columns[$columnName])) {
$oldColumn = null;
foreach ($columns as $column) {
if ($column->getName() === $columnName) {
$oldColumn = $column;
break;
}
}
if ($oldColumn === null) {
throw new InvalidArgumentException("Unknown column {$columnName} cannot be changed.");
}

$changeDefault =
$newColumn->getDefault() !== $columns[$columnName]->getDefault() ||
$newColumn->getType() !== $columns[$columnName]->getType();
$newColumn->getDefault() !== $oldColumn->getDefault() ||
$newColumn->getType() !== $oldColumn->getType();

$instructions = new AlterInstructions();
$dialect = $this->getSchemaDialect();
Expand Down
24 changes: 12 additions & 12 deletions tests/TestCase/Db/Adapter/SqlserverAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,10 +474,10 @@ public function testAddColumnWithNotNullableNoDefault()

$columns = $this->adapter->getColumns('table1');
$this->assertCount(2, $columns);
$this->assertArrayHasKey('id', $columns);
$this->assertArrayHasKey('col', $columns);
$this->assertFalse($columns['col']->isNull());
$this->assertNull($columns['col']->getDefault());
$this->assertEquals('id', $columns[0]->getName());
$this->assertEquals('col', $columns[1]->getName());
$this->assertFalse($columns[1]->isNull());
$this->assertNull($columns[1]->getDefault());
}

public function testAddColumnWithDefaultBool()
Expand Down Expand Up @@ -577,7 +577,7 @@ public function testChangeColumnDefaults()
$this->assertTrue($this->adapter->hasColumn('t', 'column1'));

$columns = $this->adapter->getColumns('t');
$this->assertSame('test', $columns['column1']->getDefault());
$this->assertSame('test', $columns[1]->getDefault());

$newColumn1 = new Column();
$newColumn1
Expand All @@ -588,7 +588,7 @@ public function testChangeColumnDefaults()
$this->assertTrue($this->adapter->hasColumn('t', 'column1'));

$columns = $this->adapter->getColumns('t');
$this->assertSame('another test', $columns['column1']->getDefault());
$this->assertSame('another test', $columns[1]->getDefault());
}

public function testChangeColumnDefaultToNull()
Expand All @@ -603,7 +603,7 @@ public function testChangeColumnDefaultToNull()
->setDefault(null);
$table->changeColumn('column1', $newColumn1)->save();
$columns = $this->adapter->getColumns('t');
$this->assertNull($columns['column1']->getDefault());
$this->assertNull($columns[1]->getDefault());
}

public function testChangeColumnDefaultToZero()
Expand All @@ -618,7 +618,7 @@ public function testChangeColumnDefaultToZero()
->setDefault(0);
$table->changeColumn('column1', $newColumn1)->save();
$columns = $this->adapter->getColumns('t');
$this->assertSame(0, $columns['column1']->getDefault());
$this->assertSame(0, $columns[1]->getDefault());
}

public function testDropColumn()
Expand Down Expand Up @@ -664,11 +664,11 @@ public function testGetColumns($colName, $type, $options, $actualType = null)

$columns = $this->adapter->getColumns('t');
$this->assertCount(2, $columns);
$this->assertEquals('id', $columns['id']->getName());
$this->assertTrue($columns['id']->getIdentity());
$this->assertEquals('id', $columns[0]->getName());
$this->assertTrue($columns[0]->getIdentity());

$this->assertEquals($colName, $columns[$colName]->getName());
$this->assertEquals($actualType ?? $type, $columns[$colName]->getType());
$this->assertEquals($colName, $columns[1]->getName());
$this->assertEquals($actualType ?? $type, $columns[1]->getType());
}

public function testAddIndex()
Expand Down
Loading