diff --git a/framework/db/sqlite/QueryBuilder.php b/framework/db/sqlite/QueryBuilder.php index 4c408579be..405601f92b 100644 --- a/framework/db/sqlite/QueryBuilder.php +++ b/framework/db/sqlite/QueryBuilder.php @@ -28,8 +28,8 @@ class QueryBuilder extends \yii\db\QueryBuilder public $typeMap = [ Schema::TYPE_PK => 'integer PRIMARY KEY AUTOINCREMENT NOT NULL', Schema::TYPE_UPK => 'integer UNSIGNED PRIMARY KEY AUTOINCREMENT NOT NULL', - Schema::TYPE_BIGPK => 'bigint PRIMARY KEY NOT NULL', - Schema::TYPE_UBIGPK => 'bigint UNSIGNED PRIMARY KEY NOT NULL', + Schema::TYPE_BIGPK => 'integer PRIMARY KEY AUTOINCREMENT NOT NULL', + Schema::TYPE_UBIGPK => 'integer UNSIGNED PRIMARY KEY AUTOINCREMENT NOT NULL', Schema::TYPE_CHAR => 'char(1)', Schema::TYPE_STRING => 'varchar(255)', Schema::TYPE_TEXT => 'text', diff --git a/framework/log/migrations/m141106_185632_log_init.php b/framework/log/migrations/m141106_185632_log_init.php index fa5485b991..3cef167df2 100644 --- a/framework/log/migrations/m141106_185632_log_init.php +++ b/framework/log/migrations/m141106_185632_log_init.php @@ -61,7 +61,7 @@ class m141106_185632_log_init extends Migration } $this->createTable($target->logTable, [ - 'id' => $this->db->driverName === 'sqlite' ? $this->primaryKey() : $this->bigPrimaryKey(), + 'id' => $this->bigPrimaryKey(), 'level' => $this->integer(), 'category' => $this->string(), 'log_time' => $this->double(), diff --git a/tests/framework/db/QueryBuilderTest.php b/tests/framework/db/QueryBuilderTest.php index 4387910a1e..0755f7da8c 100644 --- a/tests/framework/db/QueryBuilderTest.php +++ b/tests/framework/db/QueryBuilderTest.php @@ -124,7 +124,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase [ 'mysql' => 'bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY', 'postgres' => 'bigserial NOT NULL PRIMARY KEY', - 'sqlite' => 'bigint PRIMARY KEY NOT NULL', + 'sqlite' => 'integer PRIMARY KEY AUTOINCREMENT NOT NULL', ], ], [ @@ -891,7 +891,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase [ 'mysql' => 'bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY', 'postgres' => 'bigserial NOT NULL PRIMARY KEY', - 'sqlite' => 'bigint UNSIGNED PRIMARY KEY NOT NULL', + 'sqlite' => 'integer UNSIGNED PRIMARY KEY AUTOINCREMENT NOT NULL', ], ], [