Skip to content

Commit d7d1c39

Browse files
guilhermeblancomorozov
authored andcommitted
Removed identifier generator type from schema table definition
1 parent a4ecf05 commit d7d1c39

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

lib/Doctrine/DBAL/Platforms/SqlitePlatform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ public function getAlterTableSQL(TableDiff $diff)
875875
if ( ! $this->onSchemaAlterTable($diff, $tableSql)) {
876876
$dataTable = new Table('__temp__'.$table->getName());
877877

878-
$newTable = new Table($table->getQuotedName($this), $columns, $this->getPrimaryIndexInAlteredTable($diff), array(), $this->getForeignKeysInAlteredTable($diff), 0, $table->getOptions());
878+
$newTable = new Table($table->getQuotedName($this), $columns, $this->getPrimaryIndexInAlteredTable($diff), array(), $this->getForeignKeysInAlteredTable($diff), $table->getOptions());
879879
$newTable->addOption('alter', true);
880880

881881
$sql = $this->getPreAlterTableIndexForeignKeySQL($diff);

lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public function listTableDetails($tableName)
287287

288288
$indexes = $this->listTableIndexes($tableName);
289289

290-
return new Table($tableName, $columns, $indexes, [], $foreignKeys, false, []);
290+
return new Table($tableName, $columns, $indexes, [], $foreignKeys, []);
291291
}
292292

293293
/**

lib/Doctrine/DBAL/Schema/Table.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ class Table extends AbstractAsset
8383
* @param Index[] $indexes
8484
* @param UniqueConstraint[] $uniqueConstraints
8585
* @param ForeignKeyConstraint[] $fkConstraints
86-
* @param integer $idGeneratorType
8786
* @param array $options
8887
*
8988
* @throws DBALException
@@ -94,7 +93,6 @@ public function __construct(
9493
array $indexes = [],
9594
array $uniqueConstraints = [],
9695
array $fkConstraints = [],
97-
$idGeneratorType = 0,
9896
array $options = []
9997
)
10098
{
@@ -839,7 +837,7 @@ protected function _getMaxIdentifierLength()
839837
return ($this->_schemaConfig instanceof SchemaConfig)
840838
? $this->_schemaConfig->getMaxIdentifierLength()
841839
: 63
842-
;
840+
;
843841
}
844842

845843
/**

tests/Doctrine/Tests/DBAL/Functional/Schema/SchemaManagerFunctionalTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ protected function createTestTable($name = 'test_table', $data = array())
887887

888888
protected function getTestTable($name, $options=array())
889889
{
890-
$table = new Table($name, array(), array(), array(), array(), false, $options);
890+
$table = new Table($name, array(), array(), array(), array(), $options);
891891
$table->setSchemaConfig($this->_sm->createSchemaConfig());
892892
$table->addColumn('id', 'integer', array('notnull' => true));
893893
$table->setPrimaryKey(array('id'));
@@ -898,7 +898,7 @@ protected function getTestTable($name, $options=array())
898898

899899
protected function getTestCompositeTable($name)
900900
{
901-
$table = new Table($name, array(), array(), array(), array(), false, array());
901+
$table = new Table($name, array(), array(), array(), array(), array());
902902
$table->setSchemaConfig($this->_sm->createSchemaConfig());
903903
$table->addColumn('id', 'integer', array('notnull' => true));
904904
$table->addColumn('other_id', 'integer', array('notnull' => true));

tests/Doctrine/Tests/DBAL/Schema/TableTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public function testConstraints()
203203

204204
public function testOptions()
205205
{
206-
$table = new Table("foo", array(), array(), array(), array(), false, array("foo" => "bar"));
206+
$table = new Table("foo", array(), array(), array(), array(), array("foo" => "bar"));
207207

208208
self::assertTrue($table->hasOption("foo"));
209209
self::assertEquals("bar", $table->getOption("foo"));

0 commit comments

Comments
 (0)