From b08c82c5fe636859cb0299e470ab7281e81d40e9 Mon Sep 17 00:00:00 2001 From: SilverFire - Dmitry Naumenko Date: Wed, 20 Apr 2016 09:40:21 +0300 Subject: [PATCH] Driver specific QueryBuilderTest::testCommentColumn() - improved to use replaceQuotes() --- tests/framework/db/oci/OracleQueryBuilderTest.php | 16 ++++++++-------- tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php | 8 ++++---- tests/framework/db/sqlite/SqliteQueryBuilderTest.php | 5 ----- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/tests/framework/db/oci/OracleQueryBuilderTest.php b/tests/framework/db/oci/OracleQueryBuilderTest.php index 19f7efa..00f200d 100644 --- a/tests/framework/db/oci/OracleQueryBuilderTest.php +++ b/tests/framework/db/oci/OracleQueryBuilderTest.php @@ -33,25 +33,25 @@ class OracleQueryBuilderTest extends QueryBuilderTest { $qb = $this->getQueryBuilder(); - $expected = "COMMENT ON COLUMN \"comment\".\"text\" IS 'This is my column.'"; + $expected = "COMMENT ON COLUMN [[comment]].[[text]] IS 'This is my column.'"; $sql = $qb->addCommentOnColumn('comment', 'text', 'This is my column.'); - $this->assertEquals($expected, $sql); + $this->assertEquals($this->replaceQuotes($expected), $sql); - $expected = "COMMENT ON COLUMN \"comment\".\"text\" IS ''"; + $expected = "COMMENT ON COLUMN [[comment]].[[text]] IS ''"; $sql = $qb->dropCommentFromColumn('comment', 'text'); - $this->assertEquals($expected, $sql); + $this->assertEquals($this->replaceQuotes($expected), $sql); } public function testCommentTable() { $qb = $this->getQueryBuilder(); - $expected = "COMMENT ON TABLE \"comment\" IS 'This is my table.'"; + $expected = "COMMENT ON TABLE [[comment]] IS 'This is my table.'"; $sql = $qb->addCommentOnTable('comment', 'This is my table.'); - $this->assertEquals($expected, $sql); + $this->assertEquals($this->replaceQuotes($expected), $sql); - $expected = "COMMENT ON TABLE \"comment\" IS ''"; + $expected = "COMMENT ON TABLE [[comment]] IS ''"; $sql = $qb->dropCommentFromTable('comment'); - $this->assertEquals($expected, $sql); + $this->assertEquals($this->replaceQuotes($expected), $sql); } } diff --git a/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php b/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php index c728699..5de2690 100644 --- a/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php +++ b/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php @@ -100,11 +100,11 @@ class PostgreSQLQueryBuilderTest extends QueryBuilderTest { $qb = $this->getQueryBuilder(); - $expected = "COMMENT ON COLUMN \"comment\".\"text\" IS 'This is my column.'"; + $expected = "COMMENT ON COLUMN [[comment]].[[text]] IS 'This is my column.'"; $sql = $qb->addCommentOnColumn('comment', 'text', 'This is my column.'); $this->assertEquals($expected, $sql); - $expected = "COMMENT ON COLUMN \"comment\".\"text\" IS NULL"; + $expected = "COMMENT ON COLUMN [[comment]].[[text]] IS NULL"; $sql = $qb->dropCommentFromColumn('comment', 'text'); $this->assertEquals($expected, $sql); } @@ -113,11 +113,11 @@ class PostgreSQLQueryBuilderTest extends QueryBuilderTest { $qb = $this->getQueryBuilder(); - $expected = "COMMENT ON TABLE \"comment\" IS 'This is my table.'"; + $expected = "COMMENT ON TABLE [[comment]] IS 'This is my table.'"; $sql = $qb->addCommentOnTable('comment', 'This is my table.'); $this->assertEquals($expected, $sql); - $expected = "COMMENT ON TABLE \"comment\" IS NULL"; + $expected = "COMMENT ON TABLE [[comment]] IS NULL"; $sql = $qb->dropCommentFromTable('comment'); $this->assertEquals($expected, $sql); } diff --git a/tests/framework/db/sqlite/SqliteQueryBuilderTest.php b/tests/framework/db/sqlite/SqliteQueryBuilderTest.php index 8477bc8..63f6b7c 100644 --- a/tests/framework/db/sqlite/SqliteQueryBuilderTest.php +++ b/tests/framework/db/sqlite/SqliteQueryBuilderTest.php @@ -30,11 +30,6 @@ class SqliteQueryBuilderTest extends QueryBuilderTest $this->markTestSkipped('Comments are not supported in SQLite'); } - public function testCommentOnColumnSchemaBuilder() - { - $this->markTestSkipped('Comments are not supported in SQLite'); - } - public function testCommentColumn() { $this->markTestSkipped('Comments are not supported in SQLite');