Skip to content
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

Jump to bottom

Fix setting sqlsrv PK name with qualified table name #2306

Merged
merged 3 commits into from
Sep 7, 2024
Merged

Fix setting sqlsrv PK name with qualified table name #2306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25acfad
Replace dot in sqlsrv primary key name with underscore
MichaelDesignamite Sep 5, 2024
6d767f8
Merge branch '0.x' into fix-sqlsrv-pk-with-schema
MasterOdin Sep 6, 2024
575d035
add sqlsrv test
MasterOdin Sep 7, 2024
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
2 changes: 1 addition & 1 deletion src/Phinx/Db/Adapter/SqlServerAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@

// set the primary key(s)
if (isset($options['primary_key'])) {
$pkSql = sprintf('CONSTRAINT PK_%s PRIMARY KEY (', $table->getName());
$pkSql = sprintf('CONSTRAINT PK_%s PRIMARY KEY (', str_replace('.', '_', $table->getName()));

Check warning on line 273 in src/Phinx/Db/Adapter/SqlServerAdapter.php

View check run for this annotation

Codecov / codecov/patch

src/Phinx/Db/Adapter/SqlServerAdapter.php#L273 

Added line #L273 was not covered by tests
if (is_string($options['primary_key'])) { // handle primary_key => 'id'
$pkSql .= $this->quoteColumnName($options['primary_key']);
} elseif (is_array($options['primary_key'])) { // handle primary_key => array('tag_id', 'resource_id')
Expand Down
7 changes: 7 additions & 0 deletions tests/Phinx/Db/Adapter/SqlServerAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,13 @@ public function testCreateTableWithNoPrimaryKey()
$this->assertFalse($this->adapter->hasColumn('atable', 'id'));
}

public function testCreateFullyQualifiedTable()
{
(new Table('dbo.qualified_table', [], $this->adapter))->create();
$this->assertTrue($this->adapter->hasTable('dbo.qualified_table'));
$this->assertTrue($this->adapter->hasPrimaryKey('qualified_table', 'id'));
}

public function testCreateTableWithConflictingPrimaryKeys()
{
$options = [
Expand Down
Loading