diff --git a/tests/framework/db/QueryBuilderTest.php b/tests/framework/db/QueryBuilderTest.php index 8432292..05890f7 100644 --- a/tests/framework/db/QueryBuilderTest.php +++ b/tests/framework/db/QueryBuilderTest.php @@ -87,7 +87,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'bigint CHECK (value > 5)', 'sqlite' => 'bigint CHECK (value > 5)', 'oci' => 'NUMBER(20) CHECK (value > 5)', - 'mssql' => 'bigint CHECK (value > 5)', + 'sqlsrv' => 'bigint CHECK (value > 5)', 'cubrid' => 'bigint CHECK (value > 5)', ], ], @@ -99,7 +99,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'bigint NOT NULL', 'sqlite' => 'bigint NOT NULL', 'oci' => 'NUMBER(20) NOT NULL', - 'mssql' => 'bigint NOT NULL', + 'sqlsrv' => 'bigint NOT NULL', 'cubrid' => 'bigint NOT NULL', ], ], @@ -111,7 +111,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'bigint CHECK (value > 5)', 'sqlite' => 'bigint CHECK (value > 5)', 'oci' => 'NUMBER(8) CHECK (value > 5)', - 'mssql' => 'bigint CHECK (value > 5)', + 'sqlsrv' => 'bigint CHECK (value > 5)', 'cubrid' => 'bigint CHECK (value > 5)', ], ], @@ -123,7 +123,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'bigint', 'sqlite' => 'bigint', 'oci' => 'NUMBER(8)', - 'mssql' => 'bigint', + 'sqlsrv' => 'bigint', 'cubrid' => 'bigint', ], ], @@ -135,7 +135,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'bigint', 'sqlite' => 'bigint', 'oci' => 'NUMBER(20)', - 'mssql' => 'bigint', + 'sqlsrv' => 'bigint', 'cubrid' => 'bigint', ], ], @@ -155,7 +155,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'bytea', 'sqlite' => 'blob', 'oci' => 'BLOB', - 'mssql' => 'blob', + 'sqlsrv' => 'blob', 'cubrid' => 'blob', ], ], @@ -165,7 +165,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase [ 'mysql' => 'tinyint(1) NOT NULL DEFAULT 1', 'sqlite' => 'boolean NOT NULL DEFAULT 1', - 'mssql' => 'tinyint(1) NOT NULL DEFAULT 1', + 'sqlsrv' => 'tinyint(1) NOT NULL DEFAULT 1', 'cubrid' => 'smallint NOT NULL DEFAULT 1', ], ], @@ -177,7 +177,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'boolean', 'sqlite' => 'boolean', 'oci' => 'NUMBER(1)', - 'mssql' => 'tinyint(1)', + 'sqlsrv' => 'tinyint(1)', 'cubrid' => 'smallint', ], ], @@ -241,7 +241,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase // 'mysql' => , // 'postgres' => , // 'sqlite' => , - // 'mssql' => , + // 'sqlsrv' => , // 'cubrid' => , // ], //], @@ -253,7 +253,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'date NOT NULL', 'sqlite' => 'date NOT NULL', 'oci' => 'DATE NOT NULL', - 'mssql' => 'date NOT NULL', + 'sqlsrv' => 'date NOT NULL', 'cubrid' => 'date NOT NULL', ], ], @@ -265,7 +265,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'date', 'sqlite' => 'date', 'oci' => 'DATE', - 'mssql' => 'date', + 'sqlsrv' => 'date', 'cubrid' => 'date', ], ], @@ -276,7 +276,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase // 'mysql' => , // 'postgres' => , // 'sqlite' => , - // 'mssql' => , + // 'sqlsrv' => , // 'cubrid' => , // ], //], @@ -288,7 +288,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'timestamp(0) NOT NULL', 'sqlite' => 'datetime NOT NULL', 'oci' => 'TIMESTAMP NOT NULL', - 'mssql' => 'datetime NOT NULL', + 'sqlsrv' => 'datetime NOT NULL', 'cubrid' => 'datetime NOT NULL', ], ], @@ -300,7 +300,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'timestamp(0)', 'sqlite' => 'datetime', 'oci' => 'TIMESTAMP', - 'mssql' => 'datetime', + 'sqlsrv' => 'datetime', 'cubrid' => 'datetime', ], ], @@ -312,7 +312,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'numeric(10,0) CHECK (value > 5.6)', 'sqlite' => 'decimal(10,0) CHECK (value > 5.6)', 'oci' => 'NUMBER CHECK (value > 5.6)', - 'mssql' => 'decimal CHECK (value > 5.6)', + 'sqlsrv' => 'decimal CHECK (value > 5.6)', 'cubrid' => 'decimal(10,0) CHECK (value > 5.6)', ], ], @@ -324,7 +324,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'numeric(10,0) NOT NULL', 'sqlite' => 'decimal(10,0) NOT NULL', 'oci' => 'NUMBER NOT NULL', - 'mssql' => 'decimal NOT NULL', + 'sqlsrv' => 'decimal NOT NULL', 'cubrid' => 'decimal(10,0) NOT NULL', ], ], @@ -336,7 +336,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'numeric(12,4) CHECK (value > 5.6)', 'sqlite' => 'decimal(12,4) CHECK (value > 5.6)', 'oci' => 'NUMBER CHECK (value > 5.6)', - 'mssql' => 'decimal CHECK (value > 5.6)', + 'sqlsrv' => 'decimal CHECK (value > 5.6)', 'cubrid' => 'decimal(12,4) CHECK (value > 5.6)', ], ], @@ -348,7 +348,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'numeric(12,4)', 'sqlite' => 'decimal(12,4)', 'oci' => 'NUMBER', - 'mssql' => 'decimal', + 'sqlsrv' => 'decimal', 'cubrid' => 'decimal(12,4)', ], ], @@ -360,7 +360,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'numeric(10,0)', 'sqlite' => 'decimal(10,0)', 'oci' => 'NUMBER', - 'mssql' => 'decimal', + 'sqlsrv' => 'decimal', 'cubrid' => 'decimal(10,0)', ], ], @@ -372,7 +372,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'double precision CHECK (value > 5.6)', 'sqlite' => 'double CHECK (value > 5.6)', 'oci' => 'NUMBER CHECK (value > 5.6)', - 'mssql' => 'float CHECK (value > 5.6)', + 'sqlsrv' => 'float CHECK (value > 5.6)', 'cubrid' => 'double(15) CHECK (value > 5.6)', ], ], @@ -384,7 +384,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'double precision NOT NULL', 'sqlite' => 'double NOT NULL', 'oci' => 'NUMBER NOT NULL', - 'mssql' => 'float NOT NULL', + 'sqlsrv' => 'float NOT NULL', 'cubrid' => 'double(15) NOT NULL', ], ], @@ -396,7 +396,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'double precision CHECK (value > 5.6)', 'sqlite' => 'double CHECK (value > 5.6)', 'oci' => 'NUMBER CHECK (value > 5.6)', - 'mssql' => 'float CHECK (value > 5.6)', + 'sqlsrv' => 'float CHECK (value > 5.6)', 'cubrid' => 'double(16) CHECK (value > 5.6)', ], ], @@ -407,7 +407,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'mysql' => 'double', 'sqlite' => 'double', 'oci' => 'NUMBER', - 'mssql' => 'float', + 'sqlsrv' => 'float', 'cubrid' => 'double(16)', ], ], @@ -419,7 +419,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'double precision', 'sqlite' => 'double', 'oci' => 'NUMBER', - 'mssql' => 'float', + 'sqlsrv' => 'float', 'cubrid' => 'double(15)', ], ], @@ -431,7 +431,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'double precision CHECK (value > 5.6)', 'sqlite' => 'float CHECK (value > 5.6)', 'oci' => 'NUMBER CHECK (value > 5.6)', - 'mssql' => 'float CHECK (value > 5.6)', + 'sqlsrv' => 'float CHECK (value > 5.6)', 'cubrid' => 'float(7) CHECK (value > 5.6)', ], ], @@ -443,7 +443,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'double precision NOT NULL', 'sqlite' => 'float NOT NULL', 'oci' => 'NUMBER NOT NULL', - 'mssql' => 'float NOT NULL', + 'sqlsrv' => 'float NOT NULL', 'cubrid' => 'float(7) NOT NULL', ], ], @@ -455,7 +455,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'double precision CHECK (value > 5.6)', 'sqlite' => 'float CHECK (value > 5.6)', 'oci' => 'NUMBER CHECK (value > 5.6)', - 'mssql' => 'float CHECK (value > 5.6)', + 'sqlsrv' => 'float CHECK (value > 5.6)', 'cubrid' => 'float(16) CHECK (value > 5.6)', ], ], @@ -466,7 +466,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'mysql' => 'float', 'sqlite' => 'float', 'oci' => 'NUMBER', - 'mssql' => 'float', + 'sqlsrv' => 'float', 'cubrid' => 'float(16)', ], ], @@ -478,7 +478,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'double precision', 'sqlite' => 'float', 'oci' => 'NUMBER', - 'mssql' => 'float', + 'sqlsrv' => 'float', 'cubrid' => 'float(7)', ], ], @@ -490,7 +490,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'integer CHECK (value > 5)', 'sqlite' => 'integer CHECK (value > 5)', 'oci' => 'NUMBER(10) CHECK (value > 5)', - 'mssql' => 'int CHECK (value > 5)', + 'sqlsrv' => 'int CHECK (value > 5)', 'cubrid' => 'int CHECK (value > 5)', ], ], @@ -502,7 +502,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'integer NOT NULL', 'sqlite' => 'integer NOT NULL', 'oci' => 'NUMBER(10) NOT NULL', - 'mssql' => 'int NOT NULL', + 'sqlsrv' => 'int NOT NULL', 'cubrid' => 'int NOT NULL', ], ], @@ -514,7 +514,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'integer CHECK (value > 5)', 'sqlite' => 'integer CHECK (value > 5)', 'oci' => 'NUMBER(8) CHECK (value > 5)', - 'mssql' => 'int CHECK (value > 5)', + 'sqlsrv' => 'int CHECK (value > 5)', 'cubrid' => 'int CHECK (value > 5)', ], ], @@ -526,7 +526,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'integer', 'sqlite' => 'integer', 'oci' => 'NUMBER(8)', - 'mssql' => 'int', + 'sqlsrv' => 'int', 'cubrid' => 'int', ], ], @@ -538,7 +538,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'integer', 'sqlite' => 'integer', 'oci' => 'NUMBER(10)', - 'mssql' => 'int', + 'sqlsrv' => 'int', 'cubrid' => 'int', ], ], @@ -550,7 +550,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'numeric(19,4) CHECK (value > 0.0)', 'sqlite' => 'decimal(19,4) CHECK (value > 0.0)', 'oci' => 'NUMBER(19,4) CHECK (value > 0.0)', - 'mssql' => 'decimal(19,4) CHECK (value > 0.0)', + 'sqlsrv' => 'decimal(19,4) CHECK (value > 0.0)', 'cubrid' => 'decimal(19,4) CHECK (value > 0.0)', ], ], @@ -562,7 +562,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'numeric(19,4) NOT NULL', 'sqlite' => 'decimal(19,4) NOT NULL', 'oci' => 'NUMBER(19,4) NOT NULL', - 'mssql' => 'decimal(19,4) NOT NULL', + 'sqlsrv' => 'decimal(19,4) NOT NULL', 'cubrid' => 'decimal(19,4) NOT NULL', ], ], @@ -574,7 +574,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'numeric(16,2) CHECK (value > 0.0)', 'sqlite' => 'decimal(16,2) CHECK (value > 0.0)', 'oci' => 'NUMBER(16,2) CHECK (value > 0.0)', - 'mssql' => 'decimal(16,2) CHECK (value > 0.0)', + 'sqlsrv' => 'decimal(16,2) CHECK (value > 0.0)', 'cubrid' => 'decimal(16,2) CHECK (value > 0.0)', ], ], @@ -586,7 +586,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'numeric(16,2)', 'sqlite' => 'decimal(16,2)', 'oci' => 'NUMBER(16,2)', - 'mssql' => 'decimal(16,2)', + 'sqlsrv' => 'decimal(16,2)', 'cubrid' => 'decimal(16,2)', ], ], @@ -598,7 +598,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'numeric(19,4)', 'sqlite' => 'decimal(19,4)', 'oci' => 'NUMBER(19,4)', - 'mssql' => 'decimal(19,4)', + 'sqlsrv' => 'decimal(19,4)', 'cubrid' => 'decimal(19,4)', ], ], @@ -610,7 +610,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'serial NOT NULL PRIMARY KEY CHECK (value > 5)', 'sqlite' => 'integer PRIMARY KEY AUTOINCREMENT NOT NULL CHECK (value > 5)', 'oci' => 'NUMBER(10) NOT NULL PRIMARY KEY CHECK (value > 5)', - 'mssql' => 'int IDENTITY PRIMARY KEY CHECK (value > 5)', + 'sqlsrv' => 'int IDENTITY PRIMARY KEY CHECK (value > 5)', 'cubrid' => 'int NOT NULL AUTO_INCREMENT PRIMARY KEY CHECK (value > 5)', ], ], @@ -622,7 +622,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'serial NOT NULL PRIMARY KEY CHECK (value > 5)', 'sqlite' => 'integer PRIMARY KEY AUTOINCREMENT NOT NULL CHECK (value > 5)', 'oci' => 'NUMBER(8) NOT NULL PRIMARY KEY CHECK (value > 5)', - 'mssql' => 'int IDENTITY PRIMARY KEY CHECK (value > 5)', + 'sqlsrv' => 'int IDENTITY PRIMARY KEY CHECK (value > 5)', 'cubrid' => 'int NOT NULL AUTO_INCREMENT PRIMARY KEY CHECK (value > 5)', ], ], @@ -634,7 +634,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'serial NOT NULL PRIMARY KEY', 'sqlite' => 'integer PRIMARY KEY AUTOINCREMENT NOT NULL', 'oci' => 'NUMBER(8) NOT NULL PRIMARY KEY', - 'mssql' => 'int IDENTITY PRIMARY KEY', + 'sqlsrv' => 'int IDENTITY PRIMARY KEY', 'cubrid' => 'int NOT NULL AUTO_INCREMENT PRIMARY KEY', ], ], @@ -646,7 +646,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'serial NOT NULL PRIMARY KEY', 'sqlite' => 'integer PRIMARY KEY AUTOINCREMENT NOT NULL', 'oci' => 'NUMBER(10) NOT NULL PRIMARY KEY', - 'mssql' => 'int IDENTITY PRIMARY KEY', + 'sqlsrv' => 'int IDENTITY PRIMARY KEY', 'cubrid' => 'int NOT NULL AUTO_INCREMENT PRIMARY KEY', ], ], @@ -658,7 +658,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'smallint', 'sqlite' => 'smallint', 'oci' => 'NUMBER(8)', - 'mssql' => 'smallint', + 'sqlsrv' => 'smallint', 'cubrid' => 'smallint', ], ], @@ -670,7 +670,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'smallint', 'sqlite' => 'smallint', 'oci' => 'NUMBER(5)', - 'mssql' => 'smallint', + 'sqlsrv' => 'smallint', 'cubrid' => 'smallint', ], ], @@ -680,7 +680,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase [ 'mysql' => 'varchar(255) CHECK (value LIKE "test%")', 'sqlite' => 'varchar(255) CHECK (value LIKE "test%")', - 'mssql' => 'varchar(255) CHECK (value LIKE "test%")', + 'sqlsrv' => 'varchar(255) CHECK (value LIKE "test%")', 'cubrid' => 'varchar(255) CHECK (value LIKE "test%")', ], ], @@ -700,7 +700,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'varchar(255) NOT NULL', 'sqlite' => 'varchar(255) NOT NULL', 'oci' => 'VARCHAR2(255) NOT NULL', - 'mssql' => 'varchar(255) NOT NULL', + 'sqlsrv' => 'varchar(255) NOT NULL', 'cubrid' => 'varchar(255) NOT NULL', ], ], @@ -710,7 +710,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase [ 'mysql' => 'varchar(32) CHECK (value LIKE "test%")', 'sqlite' => 'varchar(32) CHECK (value LIKE "test%")', - 'mssql' => 'varchar(32) CHECK (value LIKE "test%")', + 'sqlsrv' => 'varchar(32) CHECK (value LIKE "test%")', 'cubrid' => 'varchar(32) CHECK (value LIKE "test%")', ], ], @@ -730,7 +730,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'varchar(32)', 'sqlite' => 'varchar(32)', 'oci' => 'VARCHAR2(32)', - 'mssql' => 'varchar(32)', + 'sqlsrv' => 'varchar(32)', 'cubrid' => 'varchar(32)', ], ], @@ -742,7 +742,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'varchar(255)', 'sqlite' => 'varchar(255)', 'oci' => 'VARCHAR2(255)', - 'mssql' => 'varchar(255)', + 'sqlsrv' => 'varchar(255)', 'cubrid' => 'varchar(255)', ], ], @@ -752,7 +752,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase [ 'mysql' => 'text CHECK (value LIKE "test%")', 'sqlite' => 'text CHECK (value LIKE "test%")', - 'mssql' => 'text CHECK (value LIKE "test%")', + 'sqlsrv' => 'text CHECK (value LIKE "test%")', 'cubrid' => 'varchar CHECK (value LIKE "test%")', ], ], @@ -772,7 +772,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'text NOT NULL', 'sqlite' => 'text NOT NULL', 'oci' => 'CLOB NOT NULL', - 'mssql' => 'text NOT NULL', + 'sqlsrv' => 'text NOT NULL', 'cubrid' => 'varchar NOT NULL', ], ], @@ -782,7 +782,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase [ 'mysql' => 'text CHECK (value LIKE "test%")', 'sqlite' => 'text CHECK (value LIKE "test%")', - 'mssql' => 'text CHECK (value LIKE "test%")', + 'sqlsrv' => 'text CHECK (value LIKE "test%")', 'cubrid' => 'varchar CHECK (value LIKE "test%")', ], Schema::TYPE_TEXT . ' CHECK (value LIKE "test%")', @@ -804,7 +804,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'text NOT NULL', 'sqlite' => 'text NOT NULL', 'oci' => 'CLOB NOT NULL', - 'mssql' => 'text NOT NULL', + 'sqlsrv' => 'text NOT NULL', 'cubrid' => 'varchar NOT NULL', ], Schema::TYPE_TEXT . ' NOT NULL', @@ -817,7 +817,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'text', 'sqlite' => 'text', 'oci' => 'CLOB', - 'mssql' => 'text', + 'sqlsrv' => 'text', 'cubrid' => 'varchar', ], Schema::TYPE_TEXT, @@ -830,7 +830,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'text', 'sqlite' => 'text', 'oci' => 'CLOB', - 'mssql' => 'text', + 'sqlsrv' => 'text', 'cubrid' => 'varchar', ], ], @@ -841,7 +841,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase // 'mysql' => , // 'postgres' => , // 'sqlite' => , - // 'mssql' => , + // 'sqlsrv' => , // 'cubrid' => , // ], //], @@ -853,7 +853,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'time(0) NOT NULL', 'sqlite' => 'time NOT NULL', 'oci' => 'TIMESTAMP NOT NULL', - 'mssql' => 'time NOT NULL', + 'sqlsrv' => 'time NOT NULL', 'cubrid' => 'time NOT NULL', ], ], @@ -865,7 +865,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'time(0)', 'sqlite' => 'time', 'oci' => 'TIMESTAMP', - 'mssql' => 'time', + 'sqlsrv' => 'time', 'cubrid' => 'time', ], ], @@ -876,7 +876,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase // 'mysql' => , // 'postgres' => , // 'sqlite' => , - // 'mssql' => , + // 'sqlsrv' => , // 'cubrid' => , // ], //], @@ -888,7 +888,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'timestamp(0) NOT NULL', 'sqlite' => 'timestamp NOT NULL', 'oci' => 'TIMESTAMP NOT NULL', - 'mssql' => 'timestamp NOT NULL', + 'sqlsrv' => 'timestamp NOT NULL', 'cubrid' => 'timestamp NOT NULL', ], ], @@ -900,7 +900,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase 'postgres' => 'timestamp(0)', 'sqlite' => 'timestamp', 'oci' => 'TIMESTAMP', - 'mssql' => 'timestamp', + 'sqlsrv' => 'timestamp', 'cubrid' => 'timestamp', ], ], diff --git a/tests/framework/db/cubrid/CubridQueryBuilderTest.php b/tests/framework/db/cubrid/CubridQueryBuilderTest.php index 4e5dbb5..1211fad 100644 --- a/tests/framework/db/cubrid/CubridQueryBuilderTest.php +++ b/tests/framework/db/cubrid/CubridQueryBuilderTest.php @@ -19,6 +19,6 @@ class CubridQueryBuilderTest extends QueryBuilderTest */ public function columnTypes() { - return parent::columnTypes() + []; + return array_merge(parent::columnTypes(), []); } } diff --git a/tests/framework/db/mssql/MssqlQueryBuilderTest.php b/tests/framework/db/mssql/MssqlQueryBuilderTest.php index c30e630..c821cea 100644 --- a/tests/framework/db/mssql/MssqlQueryBuilderTest.php +++ b/tests/framework/db/mssql/MssqlQueryBuilderTest.php @@ -62,6 +62,6 @@ class MssqlQueryBuilderTest extends QueryBuilderTest */ public function columnTypes() { - return parent::columnTypes() + []; + return array_merge(parent::columnTypes(), []); } } diff --git a/tests/framework/db/mysql/MysqlQueryBuilderTest.php b/tests/framework/db/mysql/MysqlQueryBuilderTest.php index 4e832e2..7b57cc4 100644 --- a/tests/framework/db/mysql/MysqlQueryBuilderTest.php +++ b/tests/framework/db/mysql/MysqlQueryBuilderTest.php @@ -17,7 +17,7 @@ class MysqlQueryBuilderTest extends QueryBuilderTest */ public function columnTypes() { - return parent::columnTypes() + [ + return array_merge(parent::columnTypes(), [ [ Schema::TYPE_PK . ' AFTER (`col_before`)', $this->primaryKey()->after('col_before'), @@ -48,6 +48,6 @@ class MysqlQueryBuilderTest extends QueryBuilderTest $this->primaryKey(8)->first()->after('col_before'), 'int(8) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST' ], - ]; + ]); } } diff --git a/tests/framework/db/oci/OracleQueryBuilderTest.php b/tests/framework/db/oci/OracleQueryBuilderTest.php index f4fd071..c082f89 100644 --- a/tests/framework/db/oci/OracleQueryBuilderTest.php +++ b/tests/framework/db/oci/OracleQueryBuilderTest.php @@ -19,12 +19,12 @@ class OracleQueryBuilderTest extends QueryBuilderTest */ public function columnTypes() { - return parent::columnTypes() + [ + return array_merge(parent::columnTypes(), [ [ Schema::TYPE_BOOLEAN . ' DEFAULT 1 NOT NULL', $this->boolean()->notNull()->defaultValue(1), 'NUMBER(1) DEFAULT 1 NOT NULL' ], - ]; + ]); } } diff --git a/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php b/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php index c55e942..b2aa8ab 100644 --- a/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php +++ b/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php @@ -15,7 +15,7 @@ class PostgreSQLQueryBuilderTest extends QueryBuilderTest public function columnTypes() { - return parent::columnTypes() + [ + return array_merge(parent::columnTypes(), [ [ Schema::TYPE_BOOLEAN . ' NOT NULL DEFAULT TRUE', $this->boolean()->notNull()->defaultValue(true), @@ -46,7 +46,7 @@ class PostgreSQLQueryBuilderTest extends QueryBuilderTest $this->timestamp(4), 'timestamp(4)' ], - ]; + ]); } public function conditionProvider() diff --git a/tests/framework/db/sqlite/SqliteQueryBuilderTest.php b/tests/framework/db/sqlite/SqliteQueryBuilderTest.php index e1ededb..37a960c 100644 --- a/tests/framework/db/sqlite/SqliteQueryBuilderTest.php +++ b/tests/framework/db/sqlite/SqliteQueryBuilderTest.php @@ -16,7 +16,7 @@ class SqliteQueryBuilderTest extends QueryBuilderTest public function columnTypes() { - return parent::columnTypes() + [ + return array_merge(parent::columnTypes(), [ [ Schema::TYPE_PK . '(8)', $this->primaryKey(8)->first()->after('col_before'), @@ -27,7 +27,7 @@ class SqliteQueryBuilderTest extends QueryBuilderTest $this->primaryKey()->first()->after('col_before'), 'integer PRIMARY KEY AUTOINCREMENT NOT NULL' ], - ]; + ]); } public function testAddDropPrimaryKey()