From db5399b12466f5000b262cb41794e7ec44e7878b Mon Sep 17 00:00:00 2001 From: Chris Harris Date: Mon, 22 Feb 2016 05:28:54 -0800 Subject: [PATCH] Added `$expectedColumnSchemaBuilder` back to test data --- tests/framework/db/QueryBuilderTest.php | 6 +++++- tests/framework/db/cubrid/CubridQueryBuilderTest.php | 3 +++ tests/framework/db/mssql/MssqlQueryBuilderTest.php | 3 +++ tests/framework/db/oci/OracleQueryBuilderTest.php | 5 ++++- tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php | 3 +++ tests/framework/db/sqlite/SqliteQueryBuilderTest.php | 3 +++ 6 files changed, 21 insertions(+), 2 deletions(-) diff --git a/tests/framework/db/QueryBuilderTest.php b/tests/framework/db/QueryBuilderTest.php index 43d5a52df5..b2a3239c66 100644 --- a/tests/framework/db/QueryBuilderTest.php +++ b/tests/framework/db/QueryBuilderTest.php @@ -162,6 +162,7 @@ class QueryBuilderTest extends DatabaseTestCase Schema::TYPE_TEXT . '(255)', $this->text(255), 'text', + Schema::TYPE_TEXT, ], [ Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', @@ -172,6 +173,7 @@ class QueryBuilderTest extends DatabaseTestCase Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")', $this->text(255)->check('value LIKE "test%"'), 'text CHECK (value LIKE "test%")', + Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', ], [ Schema::TYPE_TEXT . ' NOT NULL', @@ -182,6 +184,7 @@ class QueryBuilderTest extends DatabaseTestCase Schema::TYPE_TEXT . '(255) NOT NULL', $this->text(255)->notNull(), 'text NOT NULL', + Schema::TYPE_TEXT . ' NOT NULL', ], [ Schema::TYPE_SMALLINT, @@ -428,10 +431,11 @@ class QueryBuilderTest extends DatabaseTestCase foreach ($this->columnTypes() as $item) { list ($column, $builder, $expected) = $item; + $expectedColumnSchemaBuilder = isset($item[3]) ? $item[3] : $column; $this->assertEquals($expected, $qb->getColumnType($column)); $this->assertEquals($expected, $qb->getColumnType($builder)); - $this->assertEquals($expected, $builder->__toString()); + $this->assertEquals($expectedColumnSchemaBuilder, $builder->__toString()); } } diff --git a/tests/framework/db/cubrid/CubridQueryBuilderTest.php b/tests/framework/db/cubrid/CubridQueryBuilderTest.php index 35d47b92fc..397a79ae68 100644 --- a/tests/framework/db/cubrid/CubridQueryBuilderTest.php +++ b/tests/framework/db/cubrid/CubridQueryBuilderTest.php @@ -99,6 +99,7 @@ class CubridQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255)', $this->text(255), 'varchar', + Schema::TYPE_TEXT, ], [ Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', @@ -109,6 +110,7 @@ class CubridQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")', $this->text(255)->check('value LIKE "test%"'), 'varchar CHECK (value LIKE "test%")', + Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', ], [ Schema::TYPE_TEXT . ' NOT NULL', @@ -119,6 +121,7 @@ class CubridQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255) NOT NULL', $this->text(255)->notNull(), 'varchar NOT NULL', + Schema::TYPE_TEXT . ' NOT NULL', ], [ Schema::TYPE_SMALLINT, diff --git a/tests/framework/db/mssql/MssqlQueryBuilderTest.php b/tests/framework/db/mssql/MssqlQueryBuilderTest.php index e31440f8e6..37a850f443 100644 --- a/tests/framework/db/mssql/MssqlQueryBuilderTest.php +++ b/tests/framework/db/mssql/MssqlQueryBuilderTest.php @@ -117,6 +117,7 @@ class MssqlQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255)', $this->text(255), 'text', + Schema::TYPE_TEXT, ], [ Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', @@ -127,6 +128,7 @@ class MssqlQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")', $this->text(255)->check('value LIKE "test%"'), 'text CHECK (value LIKE "test%")', + Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', ], [ Schema::TYPE_TEXT . ' NOT NULL', @@ -137,6 +139,7 @@ class MssqlQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255) NOT NULL', $this->text(255)->notNull(), 'text NOT NULL', + Schema::TYPE_TEXT . ' NOT NULL', ], [ Schema::TYPE_SMALLINT, diff --git a/tests/framework/db/oci/OracleQueryBuilderTest.php b/tests/framework/db/oci/OracleQueryBuilderTest.php index b488a1a5fd..6203a9e8c9 100644 --- a/tests/framework/db/oci/OracleQueryBuilderTest.php +++ b/tests/framework/db/oci/OracleQueryBuilderTest.php @@ -98,7 +98,8 @@ class OracleQueryBuilderTest extends QueryBuilderTest [ Schema::TYPE_TEXT . '(255)', $this->text(255), - 'CLOB' + 'CLOB', + Schema::TYPE_TEXT, ], [ Schema::TYPE_TEXT . ' CHECK (value LIKE \'test%\')', @@ -109,6 +110,7 @@ class OracleQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255) CHECK (value LIKE \'test%\')', $this->text(255)->check('value LIKE \'test%\''), 'CLOB CHECK (value LIKE \'test%\')', + Schema::TYPE_TEXT . ' CHECK (value LIKE \'test%\')', ], [ Schema::TYPE_TEXT . ' NOT NULL', @@ -119,6 +121,7 @@ class OracleQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255) NOT NULL', $this->text(255)->notNull(), 'CLOB NOT NULL', + Schema::TYPE_TEXT . ' NOT NULL', ], [ Schema::TYPE_SMALLINT, diff --git a/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php b/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php index a2b29d8772..a41ca39c34 100644 --- a/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php +++ b/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php @@ -95,6 +95,7 @@ class PostgreSQLQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255)', $this->text(255), 'text', + Schema::TYPE_TEXT, ], [ Schema::TYPE_TEXT . ' CHECK (value LIKE \'test%\')', @@ -105,6 +106,7 @@ class PostgreSQLQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255) CHECK (value LIKE \'test%\')', $this->text(255)->check('value LIKE \'test%\''), 'text CHECK (value LIKE \'test%\')', + Schema::TYPE_TEXT . ' CHECK (value LIKE \'test%\')', ], [ Schema::TYPE_TEXT . ' NOT NULL', @@ -115,6 +117,7 @@ class PostgreSQLQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255) NOT NULL', $this->text(255)->notNull(), 'text NOT NULL', + Schema::TYPE_TEXT . ' NOT NULL', ], [ Schema::TYPE_SMALLINT, diff --git a/tests/framework/db/sqlite/SqliteQueryBuilderTest.php b/tests/framework/db/sqlite/SqliteQueryBuilderTest.php index 7f1f6dec58..6614938e37 100644 --- a/tests/framework/db/sqlite/SqliteQueryBuilderTest.php +++ b/tests/framework/db/sqlite/SqliteQueryBuilderTest.php @@ -96,6 +96,7 @@ class SqliteQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255)', $this->text(255), 'text', + Schema::TYPE_TEXT, ], [ Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', @@ -106,6 +107,7 @@ class SqliteQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")', $this->text(255)->check('value LIKE "test%"'), 'text CHECK (value LIKE "test%")', + Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', ], [ Schema::TYPE_TEXT . ' NOT NULL', @@ -116,6 +118,7 @@ class SqliteQueryBuilderTest extends QueryBuilderTest Schema::TYPE_TEXT . '(255) NOT NULL', $this->text(255)->notNull(), 'text NOT NULL', + Schema::TYPE_TEXT . ' NOT NULL', ], [ Schema::TYPE_SMALLINT,