Browse Source

Fixes `after()` column string builder (#11362)

tags/2.0.8
Chris Harris 9 years ago committed by Dmitry Naumenko
parent
commit
5316576361
  1. 2
      framework/db/cubrid/ColumnSchemaBuilder.php
  2. 2
      framework/db/mysql/ColumnSchemaBuilder.php
  3. 2
      framework/db/oci/ColumnSchemaBuilder.php
  4. 40
      tests/framework/db/QueryBuilderTest.php
  5. 8
      tests/framework/db/mysql/MysqlQueryBuilderTest.php

2
framework/db/cubrid/ColumnSchemaBuilder.php

@ -31,7 +31,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder
protected function buildAfterString()
{
return $this->after !== null ?
' AFTER (' . $this->db->quoteColumnName($this->after) . ')' :
' AFTER ' . $this->db->quoteColumnName($this->after) :
'';
}

2
framework/db/mysql/ColumnSchemaBuilder.php

@ -31,7 +31,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder
protected function buildAfterString()
{
return $this->after !== null ?
' AFTER (' . $this->db->quoteColumnName($this->after) . ')' :
' AFTER ' . $this->db->quoteColumnName($this->after) :
'';
}

2
framework/db/oci/ColumnSchemaBuilder.php

@ -31,7 +31,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder
protected function buildAfterString()
{
return $this->after !== null ?
' AFTER (' . $this->db->quoteColumnName($this->after) . ')' :
' AFTER ' . $this->db->quoteColumnName($this->after) :
'';
}

40
tests/framework/db/QueryBuilderTest.php

@ -80,15 +80,15 @@ abstract class QueryBuilderTest extends DatabaseTestCase
{
$items = [
[
Schema::TYPE_BIGINT . ' CHECK (value > 5)',
$this->bigInteger()->check('value > 5'),
Schema::TYPE_BIGINT,
$this->bigInteger(),
[
'mysql' => 'bigint(20) CHECK (value > 5)',
'postgres' => 'bigint CHECK (value > 5)',
'sqlite' => 'bigint CHECK (value > 5)',
'oci' => 'NUMBER(20) CHECK (value > 5)',
'sqlsrv' => 'bigint CHECK (value > 5)',
'cubrid' => 'bigint CHECK (value > 5)',
'mysql' => 'bigint(20)',
'postgres' => 'bigint',
'sqlite' => 'bigint',
'oci' => 'NUMBER(20)',
'sqlsrv' => 'bigint',
'cubrid' => 'bigint',
],
],
[
@ -104,13 +104,13 @@ abstract class QueryBuilderTest extends DatabaseTestCase
],
],
[
Schema::TYPE_BIGINT . '(8) CHECK (value > 5)',
$this->bigInteger(8)->check('value > 5'),
Schema::TYPE_BIGINT . ' CHECK (value > 5)',
$this->bigInteger()->check('value > 5'),
[
'mysql' => 'bigint(8) CHECK (value > 5)',
'mysql' => 'bigint(20) CHECK (value > 5)',
'postgres' => 'bigint CHECK (value > 5)',
'sqlite' => 'bigint CHECK (value > 5)',
'oci' => 'NUMBER(8) CHECK (value > 5)',
'oci' => 'NUMBER(20) CHECK (value > 5)',
'sqlsrv' => 'bigint CHECK (value > 5)',
'cubrid' => 'bigint CHECK (value > 5)',
],
@ -128,15 +128,15 @@ abstract class QueryBuilderTest extends DatabaseTestCase
],
],
[
Schema::TYPE_BIGINT,
$this->bigInteger(),
Schema::TYPE_BIGINT . '(8) CHECK (value > 5)',
$this->bigInteger(8)->check('value > 5'),
[
'mysql' => 'bigint(20)',
'postgres' => 'bigint',
'sqlite' => 'bigint',
'oci' => 'NUMBER(20)',
'sqlsrv' => 'bigint',
'cubrid' => 'bigint',
'mysql' => 'bigint(8) CHECK (value > 5)',
'postgres' => 'bigint CHECK (value > 5)',
'sqlite' => 'bigint CHECK (value > 5)',
'oci' => 'NUMBER(8) CHECK (value > 5)',
'sqlsrv' => 'bigint CHECK (value > 5)',
'cubrid' => 'bigint CHECK (value > 5)',
],
],
[

8
tests/framework/db/mysql/MysqlQueryBuilderTest.php

@ -19,9 +19,9 @@ class MysqlQueryBuilderTest extends QueryBuilderTest
{
return array_merge(parent::columnTypes(), [
[
Schema::TYPE_PK . ' AFTER (`col_before`)',
Schema::TYPE_PK . ' AFTER `col_before`',
$this->primaryKey()->after('col_before'),
'int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY AFTER (`col_before`)'
'int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY AFTER `col_before`'
],
[
Schema::TYPE_PK . ' FIRST',
@ -34,9 +34,9 @@ class MysqlQueryBuilderTest extends QueryBuilderTest
'int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST'
],
[
Schema::TYPE_PK . '(8) AFTER (`col_before`)',
Schema::TYPE_PK . '(8) AFTER `col_before`',
$this->primaryKey(8)->after('col_before'),
'int(8) NOT NULL AUTO_INCREMENT PRIMARY KEY AFTER (`col_before`)'
'int(8) NOT NULL AUTO_INCREMENT PRIMARY KEY AFTER `col_before`'
],
[
Schema::TYPE_PK . '(8) FIRST',

Loading…
Cancel
Save