Skip to content

Commit 8d8cd1a

Browse files
cebecebe
committed
adjusted dbms specific tests
1 parent 278bfca commit 8d8cd1a

File tree

5 files changed

+79
-27
lines changed

5 files changed

+79
-27
lines changed

‎tests/framework/db/ConnectionTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public function testQuoteTableName()
7575
$this->assertEquals('`table`', $connection->quoteTableName('`table`'));
7676
$this->assertEquals('`schema`.`table`', $connection->quoteTableName('schema.table'));
7777
$this->assertEquals('`schema`.`table`', $connection->quoteTableName('schema.`table`'));
78+
$this->assertEquals('`schema`.`table`', $connection->quoteTableName('`schema`.`table`'));
7879
$this->assertEquals('{{table}}', $connection->quoteTableName('{{table}}'));
7980
$this->assertEquals('(table)', $connection->quoteTableName('(table)'));
8081
}
@@ -98,7 +99,7 @@ public function testQuoteFullColumnName()
9899
$this->assertEquals('`table`.`column`', $connection->quoteColumnName('table.column'));
99100
$this->assertEquals('`table`.`column`', $connection->quoteColumnName('table.`column`'));
100101
$this->assertEquals('`table`.`column`', $connection->quoteColumnName('`table`.column'));
101-
$this->assertEquals('`table`.`column`', $connection->quoteColumnName('table.`column`'));
102+
$this->assertEquals('`table`.`column`', $connection->quoteColumnName('`table`.`column`'));
102103

103104
$this->assertEquals('[[table.column]]', $connection->quoteColumnName('[[table.column]]'));
104105
$this->assertEquals('{{table}}.`column`', $connection->quoteColumnName('{{table}}.column'));

‎tests/framework/db/cubrid/CubridConnectionTest.php‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public function testQuoteTableName()
2626
$this->assertEquals('"table"', $connection->quoteTableName('"table"'));
2727
$this->assertEquals('"schema"."table"', $connection->quoteTableName('schema.table'));
2828
$this->assertEquals('"schema"."table"', $connection->quoteTableName('schema."table"'));
29+
$this->assertEquals('"schema"."table"', $connection->quoteTableName('"schema"."table"'));
2930
$this->assertEquals('{{table}}', $connection->quoteTableName('{{table}}'));
3031
$this->assertEquals('(table)', $connection->quoteTableName('(table)'));
3132
}
@@ -35,10 +36,33 @@ public function testQuoteColumnName()
3536
$connection = $this->getConnection(false);
3637
$this->assertEquals('"column"', $connection->quoteColumnName('column'));
3738
$this->assertEquals('"column"', $connection->quoteColumnName('"column"'));
38-
$this->assertEquals('"table"."column"', $connection->quoteColumnName('table.column'));
39-
$this->assertEquals('"table"."column"', $connection->quoteColumnName('table."column"'));
4039
$this->assertEquals('[[column]]', $connection->quoteColumnName('[[column]]'));
4140
$this->assertEquals('{{column}}', $connection->quoteColumnName('{{column}}'));
4241
$this->assertEquals('(column)', $connection->quoteColumnName('(column)'));
42+
43+
$this->assertEquals('"column"', $connection->quoteSql('[[column]]'));
44+
$this->assertEquals('"column"', $connection->quoteSql('{{column}}'));
45+
}
46+
47+
public function testQuoteFullColumnName()
48+
{
49+
$connection = $this->getConnection(false, false);
50+
$this->assertEquals('"table"."column"', $connection->quoteColumnName('table.column'));
51+
$this->assertEquals('"table"."column"', $connection->quoteColumnName('table."column"'));
52+
$this->assertEquals('"table"."column"', $connection->quoteColumnName('"table".column'));
53+
$this->assertEquals('"table"."column"', $connection->quoteColumnName('"table"."column"'));
54+
55+
$this->assertEquals('[[table.column]]', $connection->quoteColumnName('[[table.column]]'));
56+
$this->assertEquals('{{table}}."column"', $connection->quoteColumnName('{{table}}.column'));
57+
$this->assertEquals('{{table}}."column"', $connection->quoteColumnName('{{table}}."column"'));
58+
$this->assertEquals('{{table}}.[[column]]', $connection->quoteColumnName('{{table}}.[[column]]'));
59+
$this->assertEquals('{{%table}}."column"', $connection->quoteColumnName('{{%table}}.column'));
60+
$this->assertEquals('{{%table}}."column"', $connection->quoteColumnName('{{%table}}."column"'));
61+
62+
$this->assertEquals('"table"."column"', $connection->quoteSql('[[table.column]]'));
63+
$this->assertEquals('"table"."column"', $connection->quoteSql('{{table}}.[[column]]'));
64+
$this->assertEquals('"table"."column"', $connection->quoteSql('{{table}}."column"'));
65+
$this->assertEquals('"table"."column"', $connection->quoteSql('{{%table}}.[[column]]'));
66+
$this->assertEquals('"table"."column"', $connection->quoteSql('{{%table}}."column"'));
4367
}
4468
}

‎tests/framework/db/mssql/MssqlConnectionTest.php‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public function testQuoteTableName()
2727
$this->assertEquals('[table]', $connection->quoteTableName('[table]'));
2828
$this->assertEquals('[schema].[table]', $connection->quoteTableName('schema.table'));
2929
$this->assertEquals('[schema].[table]', $connection->quoteTableName('schema.[table]'));
30+
$this->assertEquals('[schema].[table]', $connection->quoteTableName('[schema].[table]'));
3031
$this->assertEquals('{{table}}', $connection->quoteTableName('{{table}}'));
3132
$this->assertEquals('(table)', $connection->quoteTableName('(table)'));
3233
}
@@ -36,10 +37,33 @@ public function testQuoteColumnName()
3637
$connection = $this->getConnection(false);
3738
$this->assertEquals('[column]', $connection->quoteColumnName('column'));
3839
$this->assertEquals('[column]', $connection->quoteColumnName('[column]'));
39-
$this->assertEquals('[table].[column]', $connection->quoteColumnName('table.column'));
40-
$this->assertEquals('[table].[column]', $connection->quoteColumnName('table.[column]'));
4140
$this->assertEquals('[[column]]', $connection->quoteColumnName('[[column]]'));
4241
$this->assertEquals('{{column}}', $connection->quoteColumnName('{{column}}'));
4342
$this->assertEquals('(column)', $connection->quoteColumnName('(column)'));
43+
44+
$this->assertEquals('[column]', $connection->quoteSql('[[column]]'));
45+
$this->assertEquals('[column]', $connection->quoteSql('{{column}}'));
46+
}
47+
48+
public function testQuoteFullColumnName()
49+
{
50+
$connection = $this->getConnection(false, false);
51+
$this->assertEquals('[table].[column]', $connection->quoteColumnName('table.column'));
52+
$this->assertEquals('[table].[column]', $connection->quoteColumnName('table.[column]'));
53+
$this->assertEquals('[table].[column]', $connection->quoteColumnName('[table].column'));
54+
$this->assertEquals('[table].[column]', $connection->quoteColumnName('[table].[column]'));
55+
56+
$this->assertEquals('[[table.column]]', $connection->quoteColumnName('[[table.column]]'));
57+
$this->assertEquals('{{table}}.[column]', $connection->quoteColumnName('{{table}}.column'));
58+
$this->assertEquals('{{table}}.[column]', $connection->quoteColumnName('{{table}}.[column]'));
59+
$this->assertEquals('{{table}}.[[column]]', $connection->quoteColumnName('{{table}}.[[column]]'));
60+
$this->assertEquals('{{%table}}.[column]', $connection->quoteColumnName('{{%table}}.column'));
61+
$this->assertEquals('{{%table}}.[column]', $connection->quoteColumnName('{{%table}}.[column]'));
62+
63+
$this->assertEquals('[table].[column]', $connection->quoteSql('[[table.column]]'));
64+
$this->assertEquals('[table].[column]', $connection->quoteSql('{{table}}.[[column]]'));
65+
$this->assertEquals('[table].[column]', $connection->quoteSql('{{table}}.[column]'));
66+
$this->assertEquals('[table].[column]', $connection->quoteSql('{{%table}}.[[column]]'));
67+
$this->assertEquals('[table].[column]', $connection->quoteSql('{{%table}}.[column]'));
4468
}
4569
}

‎tests/framework/db/pgsql/PostgreSQLConnectionTest.php‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,34 @@ public function testQuoteColumnName()
4242
$connection = $this->getConnection(false);
4343
$this->assertEquals('"column"', $connection->quoteColumnName('column'));
4444
$this->assertEquals('"column"', $connection->quoteColumnName('"column"'));
45-
$this->assertEquals('"table"."column"', $connection->quoteColumnName('table.column'));
46-
$this->assertEquals('"table"."column"', $connection->quoteColumnName('table."column"'));
47-
$this->assertEquals('"table"."column"', $connection->quoteColumnName('"table"."column"'));
4845
$this->assertEquals('[[column]]', $connection->quoteColumnName('[[column]]'));
4946
$this->assertEquals('{{column}}', $connection->quoteColumnName('{{column}}'));
5047
$this->assertEquals('(column)', $connection->quoteColumnName('(column)'));
48+
49+
$this->assertEquals('"column"', $connection->quoteSql('[[column]]'));
50+
$this->assertEquals('"column"', $connection->quoteSql('{{column}}'));
51+
}
52+
53+
public function testQuoteFullColumnName()
54+
{
55+
$connection = $this->getConnection(false, false);
56+
$this->assertEquals('"table"."column"', $connection->quoteColumnName('table.column'));
57+
$this->assertEquals('"table"."column"', $connection->quoteColumnName('table."column"'));
58+
$this->assertEquals('"table"."column"', $connection->quoteColumnName('"table".column'));
59+
$this->assertEquals('"table"."column"', $connection->quoteColumnName('"table"."column"'));
60+
61+
$this->assertEquals('[[table.column]]', $connection->quoteColumnName('[[table.column]]'));
62+
$this->assertEquals('{{table}}."column"', $connection->quoteColumnName('{{table}}.column'));
63+
$this->assertEquals('{{table}}."column"', $connection->quoteColumnName('{{table}}."column"'));
64+
$this->assertEquals('{{table}}.[[column]]', $connection->quoteColumnName('{{table}}.[[column]]'));
65+
$this->assertEquals('{{%table}}."column"', $connection->quoteColumnName('{{%table}}.column'));
66+
$this->assertEquals('{{%table}}."column"', $connection->quoteColumnName('{{%table}}."column"'));
67+
68+
$this->assertEquals('"table"."column"', $connection->quoteSql('[[table.column]]'));
69+
$this->assertEquals('"table"."column"', $connection->quoteSql('{{table}}.[[column]]'));
70+
$this->assertEquals('"table"."column"', $connection->quoteSql('{{table}}."column"'));
71+
$this->assertEquals('"table"."column"', $connection->quoteSql('{{%table}}.[[column]]'));
72+
$this->assertEquals('"table"."column"', $connection->quoteSql('{{%table}}."column"'));
5173
}
5274

5375
public function testTransactionIsolation()

‎tests/framework/db/sqlite/SqliteConnectionTest.php‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,6 @@ public function testQuoteValue()
3131
$this->assertEquals("'It''s interesting'", $connection->quoteValue("It's interesting"));
3232
}
3333

34-
public function testQuoteTableName()
35-
{
36-
$connection = $this->getConnection(false);
37-
$this->assertEquals("`table`", $connection->quoteTableName('table'));
38-
$this->assertEquals("`schema`.`table`", $connection->quoteTableName('schema.table'));
39-
$this->assertEquals('{{table}}', $connection->quoteTableName('{{table}}'));
40-
$this->assertEquals('(table)', $connection->quoteTableName('(table)'));
41-
}
42-
43-
public function testQuoteColumnName()
44-
{
45-
$connection = $this->getConnection(false);
46-
$this->assertEquals('`column`', $connection->quoteColumnName('column'));
47-
$this->assertEquals("`table`.`column`", $connection->quoteColumnName('table.column'));
48-
$this->assertEquals('[[column]]', $connection->quoteColumnName('[[column]]'));
49-
$this->assertEquals('{{column}}', $connection->quoteColumnName('{{column}}'));
50-
$this->assertEquals('(column)', $connection->quoteColumnName('(column)'));
51-
}
52-
5334
public function testTransactionIsolation()
5435
{
5536
$connection = $this->getConnection(true);

0 commit comments

Comments
 (0)