Skip to content

D
doctrine-dbal
Commit 51074ffd authored by Marco Pivetta's avatar Marco Pivetta
Browse files
Options

Merge pull request #672 from deeky666/DBAL-830 

[DBAL-830] Fix SQL Server default constraint name generation for quoted identifiers
parents 85fd6247 040bfc37
Hide whitespace changes
Inline Side-by-side
Showing with 223 additions and 7 deletions
lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
View file @ 51074ffd
......@@ -322,11 +322,13 @@ class SQLServerPlatform extends AbstractPlatform
throw new \InvalidArgumentException("Incomplete column definition. 'default' required.");
}
$columnName = new Identifier($column['name']);
return
' CONSTRAINT ' .
$this->generateDefaultConstraintName($table, $column['name']) .
$this->getDefaultValueDeclarationSQL($column) .
' FOR ' . $column['name'];
' FOR ' . $columnName->getQuotedName($this);
}
/**
......@@ -1519,6 +1521,9 @@ class SQLServerPlatform extends AbstractPlatform
*/
private function generateIdentifierName($identifier)
{
return strtoupper(dechex(crc32($identifier)));
// Always generate name for unquoted identifiers to ensure consistency.
$identifier = new Identifier($identifier);
return strtoupper(dechex(crc32($identifier->getName())));
}
}
lib/Doctrine/DBAL/Schema/AbstractAsset.php
View file @ 51074ffd
......@@ -155,7 +155,7 @@ abstract class AbstractAsset
*/
protected function isIdentifierQuoted($identifier)
{
return (isset($identifier[0]) && ($identifier[0] == '`' || $identifier[0] == '"'));
return (isset($identifier[0]) && ($identifier[0] == '`' || $identifier[0] == '"' || $identifier[0] == '['));
}
/**
......@@ -167,7 +167,7 @@ abstract class AbstractAsset
*/
protected function trimQuotes($identifier)
{
return str_replace(array('`', '"'), '', $identifier);
return str_replace(array('`', '"', '[', ']'), '', $identifier);
}
/**
......
tests/Doctrine/Tests/DBAL/Platforms/AbstractSQLServerPlatformTestCase.php
View file @ 51074ffd
......@@ -255,16 +255,16 @@ abstract class AbstractSQLServerPlatformTestCase extends AbstractPlatformTestCas
$query.= 'WHERE (table1.column1 = table2.column2) AND (table1.column1 = table3.column3) AND (table1.column1 = table4.column4) AND (table1.column1 = table5.column5) AND (table1.column1 = table6.column6) AND (table1.column1 = table7.column7) AND (table1.column1 = table8.column8) AND (table2.column2 = table3.column3) AND (table2.column2 = table4.column4) AND (table2.column2 = table5.column5) AND (table2.column2 = table6.column6) ';
$query.= 'AND (table2.column2 = table7.column7) AND (table2.column2 = table8.column8) AND (table3.column3 = table4.column4) AND (table3.column3 = table5.column5) AND (table3.column3 = table6.column6) AND (table3.column3 = table7.column7) AND (table3.column3 = table8.column8) AND (table4.column4 = table5.column5) AND (table4.column4 = table6.column6) AND (table4.column4 = table7.column7) AND (table4.column4 = table8.column8) ';
$query.= 'AND (table5.column5 = table6.column6) AND (table5.column5 = table7.column7) AND (table5.column5 = table8.column8) AND (table6.column6 = table7.column7) AND (table6.column6 = table8.column8) AND (table7.column7 = table8.column8)';
$sql = $this->_platform->modifyLimitQuery($query, 10);
$expected = 'SELECT * FROM (SELECT table1.column1, table2.column2, table3.column3, table4.column4, table5.column5, table6.column6, table7.column7, table8.column8, ROW_NUMBER() OVER (ORDER BY (SELECT 0)) AS doctrine_rownum ';
$expected.= 'FROM table1, table2, table3, table4, table5, table6, table7, table8 ';
$expected.= 'WHERE (table1.column1 = table2.column2) AND (table1.column1 = table3.column3) AND (table1.column1 = table4.column4) AND (table1.column1 = table5.column5) AND (table1.column1 = table6.column6) AND (table1.column1 = table7.column7) AND (table1.column1 = table8.column8) AND (table2.column2 = table3.column3) AND (table2.column2 = table4.column4) ';
$expected.= 'AND (table2.column2 = table5.column5) AND (table2.column2 = table6.column6) AND (table2.column2 = table7.column7) AND (table2.column2 = table8.column8) AND (table3.column3 = table4.column4) AND (table3.column3 = table5.column5) AND (table3.column3 = table6.column6) AND (table3.column3 = table7.column7) AND (table3.column3 = table8.column8) AND (table4.column4 = table5.column5) AND (table4.column4 = table6.column6) ';
$expected.= 'AND (table4.column4 = table7.column7) AND (table4.column4 = table8.column8) AND (table5.column5 = table6.column6) AND (table5.column5 = table7.column7) AND (table5.column5 = table8.column8) AND (table6.column6 = table7.column7) AND (table6.column6 = table8.column8) AND (table7.column7 = table8.column8)) ';
$expected.= 'AS doctrine_tbl WHERE doctrine_rownum BETWEEN 1 AND 10';
$this->assertEquals($expected, $sql);
}
......@@ -920,4 +920,185 @@ abstract class AbstractSQLServerPlatformTestCase extends AbstractPlatformTestCas
"EXEC sp_RENAME N'[schema].[table].[foo]', N'[bar]', N'INDEX'",
);
}
/**
* @dataProvider getGeneratesIdentifierNamesInDefaultConstraintDeclarationSQL
* @group DBAL-830
*/
public function testGeneratesIdentifierNamesInDefaultConstraintDeclarationSQL($table, $column, $expectedSql)
{
$this->assertSame($expectedSql, $this->_platform->getDefaultConstraintDeclarationSQL($table, $column));
}
public function getGeneratesIdentifierNamesInDefaultConstraintDeclarationSQL()
{
return array(
// Unquoted identifiers non-reserved keywords.
array('mytable', array('name' => 'mycolumn', 'default' => 'foo'), " CONSTRAINT DF_6B2BD609_9BADD926 DEFAULT 'foo' FOR mycolumn"),
// Quoted identifiers non-reserved keywords.
array('`mytable`', array('name' => '`mycolumn`', 'default' => 'foo'), " CONSTRAINT DF_6B2BD609_9BADD926 DEFAULT 'foo' FOR [mycolumn]"),
// Unquoted identifiers reserved keywords.
array('table', array('name' => 'select', 'default' => 'foo'), " CONSTRAINT DF_F6298F46_4BF2EAC0 DEFAULT 'foo' FOR [select]"),
// Quoted identifiers reserved keywords.
array('`table`', array('name' => '`select`', 'default' => 'foo'), " CONSTRAINT DF_F6298F46_4BF2EAC0 DEFAULT 'foo' FOR [select]"),
);
}
/**
* @dataProvider getGeneratesIdentifierNamesInCreateTableSQL
* @group DBAL-830
*/
public function testGeneratesIdentifierNamesInCreateTableSQL($table, $expectedSql)
{
$this->assertSame($expectedSql, $this->_platform->getCreateTableSQL($table));
}
public function getGeneratesIdentifierNamesInCreateTableSQL()
{
return array(
// Unquoted identifiers non-reserved keywords.
array(
new Table('mytable', array(new Column('mycolumn', Type::getType('string'), array('default' => 'foo')))),
array(
'CREATE TABLE mytable (mycolumn NVARCHAR(255) NOT NULL)',
"ALTER TABLE mytable ADD CONSTRAINT DF_6B2BD609_9BADD926 DEFAULT 'foo' FOR mycolumn"
)
),
// Quoted identifiers reserved keywords.
array(
new Table('`mytable`', array(new Column('`mycolumn`', Type::getType('string'), array('default' => 'foo')))),
array(
'CREATE TABLE [mytable] ([mycolumn] NVARCHAR(255) NOT NULL)',
"ALTER TABLE [mytable] ADD CONSTRAINT DF_6B2BD609_9BADD926 DEFAULT 'foo' FOR [mycolumn]"
)
),
// Unquoted identifiers reserved keywords.
array(
new Table('table', array(new Column('select', Type::getType('string'), array('default' => 'foo')))),
array(
'CREATE TABLE [table] ([select] NVARCHAR(255) NOT NULL)',
"ALTER TABLE [table] ADD CONSTRAINT DF_F6298F46_4BF2EAC0 DEFAULT 'foo' FOR [select]"
)
),
// Quoted identifiers reserved keywords.
array(
new Table('`table`', array(new Column('`select`', Type::getType('string'), array('default' => 'foo')))),
array(
'CREATE TABLE [table] ([select] NVARCHAR(255) NOT NULL)',
"ALTER TABLE [table] ADD CONSTRAINT DF_F6298F46_4BF2EAC0 DEFAULT 'foo' FOR [select]"
)
),
);
}
/**
* @dataProvider getGeneratesIdentifierNamesInAlterTableSQL
* @group DBAL-830
*/
public function testGeneratesIdentifierNamesInAlterTableSQL($tableDiff, $expectedSql)
{
$this->assertSame($expectedSql, $this->_platform->getAlterTableSQL($tableDiff));
}
public function getGeneratesIdentifierNamesInAlterTableSQL()
{
return array(
// Unquoted identifiers non-reserved keywords.
array(
new TableDiff(
'mytable',
array(new Column('addcolumn', Type::getType('string'), array('default' => 'foo'))),
array(
'mycolumn' => new ColumnDiff(
'mycolumn',
new Column('mycolumn', Type::getType('string'), array('default' => 'bar')),
array('default'),
new Column('mycolumn', Type::getType('string'), array('default' => 'foo'))
)
),
array(new Column('removecolumn', Type::getType('string'), array('default' => 'foo')))
),
array(
'ALTER TABLE mytable ADD addcolumn NVARCHAR(255) NOT NULL',
"ALTER TABLE mytable ADD CONSTRAINT DF_6B2BD609_4AD86123 DEFAULT 'foo' FOR addcolumn",
'ALTER TABLE mytable DROP COLUMN removecolumn',
'ALTER TABLE mytable DROP CONSTRAINT DF_6B2BD609_9BADD926',
'ALTER TABLE mytable ALTER COLUMN mycolumn NVARCHAR(255) NOT NULL',
"ALTER TABLE mytable ADD CONSTRAINT DF_6B2BD609_9BADD926 DEFAULT 'bar' FOR mycolumn"
)
),
// Quoted identifiers non-reserved keywords.
array(
new TableDiff(
'`mytable`',
array(new Column('`addcolumn`', Type::getType('string'), array('default' => 'foo'))),
array(
'mycolumn' => new ColumnDiff(
'`mycolumn`',
new Column('`mycolumn`', Type::getType('string'), array('default' => 'bar')),
array('default'),
new Column('`mycolumn`', Type::getType('string'), array('default' => 'foo'))
)
),
array(new Column('`removecolumn`', Type::getType('string'), array('default' => 'foo')))
),
array(
'ALTER TABLE [mytable] ADD [addcolumn] NVARCHAR(255) NOT NULL',
"ALTER TABLE [mytable] ADD CONSTRAINT DF_6B2BD609_4AD86123 DEFAULT 'foo' FOR [addcolumn]",
'ALTER TABLE [mytable] DROP COLUMN [removecolumn]',
'ALTER TABLE [mytable] DROP CONSTRAINT DF_6B2BD609_9BADD926',
'ALTER TABLE [mytable] ALTER COLUMN [mycolumn] NVARCHAR(255) NOT NULL',
"ALTER TABLE [mytable] ADD CONSTRAINT DF_6B2BD609_9BADD926 DEFAULT 'bar' FOR [mycolumn]"
)
),
// Unquoted identifiers reserved keywords.
array(
new TableDiff(
'table',
array(new Column('add', Type::getType('string'), array('default' => 'foo'))),
array(
'select' => new ColumnDiff(
'select',
new Column('select', Type::getType('string'), array('default' => 'bar')),
array('default'),
new Column('select', Type::getType('string'), array('default' => 'foo'))
)
),
array(new Column('drop', Type::getType('string'), array('default' => 'foo')))
),
array(
'ALTER TABLE [table] ADD [add] NVARCHAR(255) NOT NULL',
"ALTER TABLE [table] ADD CONSTRAINT DF_F6298F46_FD1A73E7 DEFAULT 'foo' FOR [add]",
'ALTER TABLE [table] DROP COLUMN [drop]',
'ALTER TABLE [table] DROP CONSTRAINT DF_F6298F46_4BF2EAC0',
'ALTER TABLE [table] ALTER COLUMN [select] NVARCHAR(255) NOT NULL',
"ALTER TABLE [table] ADD CONSTRAINT DF_F6298F46_4BF2EAC0 DEFAULT 'bar' FOR [select]"
)
),
// Quoted identifiers reserved keywords.
array(
new TableDiff(
'`table`',
array(new Column('`add`', Type::getType('string'), array('default' => 'foo'))),
array(
'select' => new ColumnDiff(
'`select`',
new Column('`select`', Type::getType('string'), array('default' => 'bar')),
array('default'),
new Column('`select`', Type::getType('string'), array('default' => 'foo'))
)
),
array(new Column('`drop`', Type::getType('string'), array('default' => 'foo')))
),
array(
'ALTER TABLE [table] ADD [add] NVARCHAR(255) NOT NULL',
"ALTER TABLE [table] ADD CONSTRAINT DF_F6298F46_FD1A73E7 DEFAULT 'foo' FOR [add]",
'ALTER TABLE [table] DROP COLUMN [drop]',
'ALTER TABLE [table] DROP CONSTRAINT DF_F6298F46_4BF2EAC0',
'ALTER TABLE [table] ALTER COLUMN [select] NVARCHAR(255) NOT NULL',
"ALTER TABLE [table] ADD CONSTRAINT DF_F6298F46_4BF2EAC0 DEFAULT 'bar' FOR [select]"
)
),
);
}
}
tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php
View file @ 51074ffd
......@@ -80,6 +80,7 @@ class ColumnTest extends \PHPUnit_Framework_TestCase
/**
* @group DBAL-64
* @group DBAL-830
*/
public function testQuotedColumnName()
{
......@@ -92,6 +93,35 @@ class ColumnTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('bar', $column->getName());
$this->assertEquals('`bar`', $column->getQuotedName($mysqlPlatform));
$this->assertEquals('"bar"', $column->getQuotedName($sqlitePlatform));
$column = new Column("[bar]", $string);
$sqlServerPlatform = new \Doctrine\DBAL\Platforms\SQLServerPlatform();
$this->assertEquals('bar', $column->getName());
$this->assertEquals('[bar]', $column->getQuotedName($sqlServerPlatform));
}
/**
* @dataProvider getIsQuoted
* @group DBAL-830
*/
public function testIsQuoted($columnName, $isQuoted)
{
$type = Type::getType('string');
$column = new Column($columnName, $type);
$this->assertSame($isQuoted, $column->isQuoted());
}
public function getIsQuoted()
{
return array(
array('bar', false),
array('`bar`', true),
array('"bar"', true),
array('[bar]', true),
);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment