Unverified Commit 64c15257 authored by Guilherme Blanco's avatar Guilherme Blanco Committed by Sergei Morozov

Removed identifier generator type from schema table definition

parent b0cc6692
...@@ -916,7 +916,7 @@ class SqlitePlatform extends AbstractPlatform ...@@ -916,7 +916,7 @@ class SqlitePlatform extends AbstractPlatform
if (! $this->onSchemaAlterTable($diff, $tableSql)) { if (! $this->onSchemaAlterTable($diff, $tableSql)) {
$dataTable = new Table('__temp__' . $table->getName()); $dataTable = new Table('__temp__' . $table->getName());
$newTable = new Table($table->getQuotedName($this), $columns, $this->getPrimaryIndexInAlteredTable($diff), [], $this->getForeignKeysInAlteredTable($diff), 0, $table->getOptions()); $newTable = new Table($table->getQuotedName($this), $columns, $this->getPrimaryIndexInAlteredTable($diff), [], $this->getForeignKeysInAlteredTable($diff), $table->getOptions());
$newTable->addOption('alter', true); $newTable->addOption('alter', true);
$sql = $this->getPreAlterTableIndexForeignKeySQL($diff); $sql = $this->getPreAlterTableIndexForeignKeySQL($diff);
......
...@@ -277,7 +277,7 @@ abstract class AbstractSchemaManager ...@@ -277,7 +277,7 @@ abstract class AbstractSchemaManager
$indexes = $this->listTableIndexes($tableName); $indexes = $this->listTableIndexes($tableName);
return new Table($tableName, $columns, $indexes, [], $foreignKeys); return new Table($tableName, $columns, $indexes, [], $foreignKeys, []);
} }
/** /**
......
...@@ -53,7 +53,6 @@ class Table extends AbstractAsset ...@@ -53,7 +53,6 @@ class Table extends AbstractAsset
* @param Index[] $indexes * @param Index[] $indexes
* @param UniqueConstraint[] $uniqueConstraints * @param UniqueConstraint[] $uniqueConstraints
* @param ForeignKeyConstraint[] $fkConstraints * @param ForeignKeyConstraint[] $fkConstraints
* @param int $idGeneratorType
* @param mixed[] $options * @param mixed[] $options
* *
* @throws DBALException * @throws DBALException
...@@ -64,7 +63,6 @@ class Table extends AbstractAsset ...@@ -64,7 +63,6 @@ class Table extends AbstractAsset
array $indexes = [], array $indexes = [],
array $uniqueConstraints = [], array $uniqueConstraints = [],
array $fkConstraints = [], array $fkConstraints = [],
$idGeneratorType = 0,
array $options = [] array $options = []
) { ) {
if (strlen($tableName) === 0) { if (strlen($tableName) === 0) {
......
...@@ -982,7 +982,7 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase ...@@ -982,7 +982,7 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
*/ */
protected function getTestTable(string $name, array $options = []) : Table protected function getTestTable(string $name, array $options = []) : Table
{ {
$table = new Table($name, [], [], [], [], false, $options); $table = new Table($name, [], [], [], [], $options);
$table->setSchemaConfig($this->schemaManager->createSchemaConfig()); $table->setSchemaConfig($this->schemaManager->createSchemaConfig());
$table->addColumn('id', 'integer', ['notnull' => true]); $table->addColumn('id', 'integer', ['notnull' => true]);
$table->setPrimaryKey(['id']); $table->setPrimaryKey(['id']);
...@@ -994,7 +994,7 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase ...@@ -994,7 +994,7 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
protected function getTestCompositeTable(string $name) : Table protected function getTestCompositeTable(string $name) : Table
{ {
$table = new Table($name, [], [], [], [], false, []); $table = new Table($name, [], [], [], [], []);
$table->setSchemaConfig($this->schemaManager->createSchemaConfig()); $table->setSchemaConfig($this->schemaManager->createSchemaConfig());
$table->addColumn('id', 'integer', ['notnull' => true]); $table->addColumn('id', 'integer', ['notnull' => true]);
$table->addColumn('other_id', 'integer', ['notnull' => true]); $table->addColumn('other_id', 'integer', ['notnull' => true]);
......
...@@ -209,7 +209,7 @@ class TableTest extends DbalTestCase ...@@ -209,7 +209,7 @@ class TableTest extends DbalTestCase
public function testOptions() : void public function testOptions() : void
{ {
$table = new Table('foo', [], [], [], [], false, ['foo' => 'bar']); $table = new Table('foo', [], [], [], [], ['foo' => 'bar']);
self::assertTrue($table->hasOption('foo')); self::assertTrue($table->hasOption('foo'));
self::assertEquals('bar', $table->getOption('foo')); self::assertEquals('bar', $table->getOption('foo'));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment