php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-14 13:25:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added $expectedColumnSchemaBuilder back to test data

Browse Source
This commit is contained in:
Chris Harris
2016-02-22 05:28:54 -08:00
parent e0e82bc56b
commit db5399b124
6 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/framework/db/QueryBuilderTest.php
View File

@@ -162,6 +162,7 @@ class QueryBuilderTest extends DatabaseTestCase
Schema::TYPE_TEXT . '(255)', Schema::TYPE_TEXT . '(255)',
$this->text(255), $this->text(255),
'text', 'text',
Schema::TYPE_TEXT,
], ],
[ [
Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")',
@@ -172,6 +173,7 @@ class QueryBuilderTest extends DatabaseTestCase
Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")', Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")',
$this->text(255)->check('value LIKE "test%"'), $this->text(255)->check('value LIKE "test%"'),
'text CHECK (value LIKE "test%")', 'text CHECK (value LIKE "test%")',
Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")',
], ],
[ [
Schema::TYPE_TEXT . ' NOT NULL', Schema::TYPE_TEXT . ' NOT NULL',
@@ -182,6 +184,7 @@ class QueryBuilderTest extends DatabaseTestCase
Schema::TYPE_TEXT . '(255) NOT NULL', Schema::TYPE_TEXT . '(255) NOT NULL',
$this->text(255)->notNull(), $this->text(255)->notNull(),
'text NOT NULL', 'text NOT NULL',
Schema::TYPE_TEXT . ' NOT NULL',
], ],
[ [
Schema::TYPE_SMALLINT, Schema::TYPE_SMALLINT,
@@ -428,10 +431,11 @@ class QueryBuilderTest extends DatabaseTestCase
foreach ($this->columnTypes() as $item) { foreach ($this->columnTypes() as $item) {
list ($column, $builder, $expected) = $item; list ($column, $builder, $expected) = $item;
$expectedColumnSchemaBuilder = isset($item[3]) ? $item[3] : $column;
$this->assertEquals($expected, $qb->getColumnType($column)); $this->assertEquals($expected, $qb->getColumnType($column));
$this->assertEquals($expected, $qb->getColumnType($builder)); $this->assertEquals($expected, $qb->getColumnType($builder));
$this->assertEquals($expected, $builder->__toString()); $this->assertEquals($expectedColumnSchemaBuilder, $builder->__toString());
} }
} }

3
tests/framework/db/cubrid/CubridQueryBuilderTest.php
View File

@@ -99,6 +99,7 @@ class CubridQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255)', Schema::TYPE_TEXT . '(255)',
$this->text(255), $this->text(255),
'varchar', 'varchar',
Schema::TYPE_TEXT,
], ],
[ [
Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")',
@@ -109,6 +110,7 @@ class CubridQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")', Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")',
$this->text(255)->check('value LIKE "test%"'), $this->text(255)->check('value LIKE "test%"'),
'varchar CHECK (value LIKE "test%")', 'varchar CHECK (value LIKE "test%")',
Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")',
], ],
[ [
Schema::TYPE_TEXT . ' NOT NULL', Schema::TYPE_TEXT . ' NOT NULL',
@@ -119,6 +121,7 @@ class CubridQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255) NOT NULL', Schema::TYPE_TEXT . '(255) NOT NULL',
$this->text(255)->notNull(), $this->text(255)->notNull(),
'varchar NOT NULL', 'varchar NOT NULL',
Schema::TYPE_TEXT . ' NOT NULL',
], ],
[ [
Schema::TYPE_SMALLINT, Schema::TYPE_SMALLINT,

3
tests/framework/db/mssql/MssqlQueryBuilderTest.php
View File

@@ -117,6 +117,7 @@ class MssqlQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255)', Schema::TYPE_TEXT . '(255)',
$this->text(255), $this->text(255),
'text', 'text',
Schema::TYPE_TEXT,
], ],
[ [
Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")',
@@ -127,6 +128,7 @@ class MssqlQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")', Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")',
$this->text(255)->check('value LIKE "test%"'), $this->text(255)->check('value LIKE "test%"'),
'text CHECK (value LIKE "test%")', 'text CHECK (value LIKE "test%")',
Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")',
], ],
[ [
Schema::TYPE_TEXT . ' NOT NULL', Schema::TYPE_TEXT . ' NOT NULL',
@@ -137,6 +139,7 @@ class MssqlQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255) NOT NULL', Schema::TYPE_TEXT . '(255) NOT NULL',
$this->text(255)->notNull(), $this->text(255)->notNull(),
'text NOT NULL', 'text NOT NULL',
Schema::TYPE_TEXT . ' NOT NULL',
], ],
[ [
Schema::TYPE_SMALLINT, Schema::TYPE_SMALLINT,

5
tests/framework/db/oci/OracleQueryBuilderTest.php
View File

@@ -98,7 +98,8 @@ class OracleQueryBuilderTest extends QueryBuilderTest
[ [
Schema::TYPE_TEXT . '(255)', Schema::TYPE_TEXT . '(255)',
$this->text(255), $this->text(255),
'CLOB' 'CLOB',
Schema::TYPE_TEXT,
], ],
[ [
Schema::TYPE_TEXT . ' CHECK (value LIKE \'test%\')', Schema::TYPE_TEXT . ' CHECK (value LIKE \'test%\')',
@@ -109,6 +110,7 @@ class OracleQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255) CHECK (value LIKE \'test%\')', Schema::TYPE_TEXT . '(255) CHECK (value LIKE \'test%\')',
$this->text(255)->check('value LIKE \'test%\''), $this->text(255)->check('value LIKE \'test%\''),
'CLOB CHECK (value LIKE \'test%\')', 'CLOB CHECK (value LIKE \'test%\')',
Schema::TYPE_TEXT . ' CHECK (value LIKE \'test%\')',
], ],
[ [
Schema::TYPE_TEXT . ' NOT NULL', Schema::TYPE_TEXT . ' NOT NULL',
@@ -119,6 +121,7 @@ class OracleQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255) NOT NULL', Schema::TYPE_TEXT . '(255) NOT NULL',
$this->text(255)->notNull(), $this->text(255)->notNull(),
'CLOB NOT NULL', 'CLOB NOT NULL',
Schema::TYPE_TEXT . ' NOT NULL',
], ],
[ [
Schema::TYPE_SMALLINT, Schema::TYPE_SMALLINT,

3
tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php
View File

@@ -95,6 +95,7 @@ class PostgreSQLQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255)', Schema::TYPE_TEXT . '(255)',
$this->text(255), $this->text(255),
'text', 'text',
Schema::TYPE_TEXT,
], ],
[ [
Schema::TYPE_TEXT . ' CHECK (value LIKE \'test%\')', Schema::TYPE_TEXT . ' CHECK (value LIKE \'test%\')',
@@ -105,6 +106,7 @@ class PostgreSQLQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255) CHECK (value LIKE \'test%\')', Schema::TYPE_TEXT . '(255) CHECK (value LIKE \'test%\')',
$this->text(255)->check('value LIKE \'test%\''), $this->text(255)->check('value LIKE \'test%\''),
'text CHECK (value LIKE \'test%\')', 'text CHECK (value LIKE \'test%\')',
Schema::TYPE_TEXT . ' CHECK (value LIKE \'test%\')',
], ],
[ [
Schema::TYPE_TEXT . ' NOT NULL', Schema::TYPE_TEXT . ' NOT NULL',
@@ -115,6 +117,7 @@ class PostgreSQLQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255) NOT NULL', Schema::TYPE_TEXT . '(255) NOT NULL',
$this->text(255)->notNull(), $this->text(255)->notNull(),
'text NOT NULL', 'text NOT NULL',
Schema::TYPE_TEXT . ' NOT NULL',
], ],
[ [
Schema::TYPE_SMALLINT, Schema::TYPE_SMALLINT,

3
tests/framework/db/sqlite/SqliteQueryBuilderTest.php
View File

@@ -96,6 +96,7 @@ class SqliteQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255)', Schema::TYPE_TEXT . '(255)',
$this->text(255), $this->text(255),
'text', 'text',
Schema::TYPE_TEXT,
], ],
[ [
Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")',
@@ -106,6 +107,7 @@ class SqliteQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")', Schema::TYPE_TEXT . '(255) CHECK (value LIKE "test%")',
$this->text(255)->check('value LIKE "test%"'), $this->text(255)->check('value LIKE "test%"'),
'text CHECK (value LIKE "test%")', 'text CHECK (value LIKE "test%")',
Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")',
], ],
[ [
Schema::TYPE_TEXT . ' NOT NULL', Schema::TYPE_TEXT . ' NOT NULL',
@@ -116,6 +118,7 @@ class SqliteQueryBuilderTest extends QueryBuilderTest
Schema::TYPE_TEXT . '(255) NOT NULL', Schema::TYPE_TEXT . '(255) NOT NULL',
$this->text(255)->notNull(), $this->text(255)->notNull(),
'text NOT NULL', 'text NOT NULL',
Schema::TYPE_TEXT . ' NOT NULL',
], ],
[ [
Schema::TYPE_SMALLINT, Schema::TYPE_SMALLINT,