Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
dec14fb8
Unverified
Commit
dec14fb8
authored
Sep 24, 2016
by
Guilherme Blanco
Committed by
Sergei Morozov
Nov 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed identifier generator type from schema table definition
parent
7b124ec7
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
7 deletions
+5
-7
SqlitePlatform.php
lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
+1
-1
AbstractSchemaManager.php
lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
+1
-1
Table.php
lib/Doctrine/DBAL/Schema/Table.php
+0
-2
SchemaManagerFunctionalTestCase.php
...BAL/Functional/Schema/SchemaManagerFunctionalTestCase.php
+2
-2
TableTest.php
tests/Doctrine/Tests/DBAL/Schema/TableTest.php
+1
-1
No files found.
lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
View file @
dec14fb8
...
...
@@ -898,7 +898,7 @@ class SqlitePlatform extends AbstractPlatform
if
(
!
$this
->
onSchemaAlterTable
(
$diff
,
$tableSql
))
{
$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
);
$sql
=
$this
->
getPreAlterTableIndexForeignKeySQL
(
$diff
);
...
...
lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
View file @
dec14fb8
...
...
@@ -270,7 +270,7 @@ abstract class AbstractSchemaManager
$indexes
=
$this
->
listTableIndexes
(
$tableName
);
return
new
Table
(
$tableName
,
$columns
,
$indexes
,
[],
$foreignKeys
,
false
,
[]);
return
new
Table
(
$tableName
,
$columns
,
$indexes
,
[],
$foreignKeys
,
[]);
}
/**
...
...
lib/Doctrine/DBAL/Schema/Table.php
View file @
dec14fb8
...
...
@@ -55,7 +55,6 @@ class Table extends AbstractAsset
* @param Index[] $indexes
* @param UniqueConstraint[] $uniqueConstraints
* @param ForeignKeyConstraint[] $fkConstraints
* @param int $idGeneratorType
* @param mixed[] $options
*
* @throws DBALException
...
...
@@ -66,7 +65,6 @@ class Table extends AbstractAsset
array
$indexes
=
[],
array
$uniqueConstraints
=
[],
array
$fkConstraints
=
[],
$idGeneratorType
=
0
,
array
$options
=
[]
)
{
if
(
strlen
(
$tableName
)
===
0
)
{
...
...
tests/Doctrine/Tests/DBAL/Functional/Schema/SchemaManagerFunctionalTestCase.php
View file @
dec14fb8
...
...
@@ -976,7 +976,7 @@ class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
protected
function
getTestTable
(
$name
,
$options
=
[])
{
$table
=
new
Table
(
$name
,
[],
[],
[],
[],
false
,
$options
);
$table
=
new
Table
(
$name
,
[],
[],
[],
[],
$options
);
$table
->
setSchemaConfig
(
$this
->
schemaManager
->
createSchemaConfig
());
$table
->
addColumn
(
'id'
,
'integer'
,
[
'notnull'
=>
true
]);
$table
->
setPrimaryKey
([
'id'
]);
...
...
@@ -987,7 +987,7 @@ class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
protected
function
getTestCompositeTable
(
$name
)
{
$table
=
new
Table
(
$name
,
[],
[],
[],
[],
false
,
[]);
$table
=
new
Table
(
$name
,
[],
[],
[],
[],
[]);
$table
->
setSchemaConfig
(
$this
->
schemaManager
->
createSchemaConfig
());
$table
->
addColumn
(
'id'
,
'integer'
,
[
'notnull'
=>
true
]);
$table
->
addColumn
(
'other_id'
,
'integer'
,
[
'notnull'
=>
true
]);
...
...
tests/Doctrine/Tests/DBAL/Schema/TableTest.php
View file @
dec14fb8
...
...
@@ -209,7 +209,7 @@ class TableTest extends DbalTestCase
public
function
testOptions
()
{
$table
=
new
Table
(
'foo'
,
[],
[],
[],
[],
false
,
[
'foo'
=>
'bar'
]);
$table
=
new
Table
(
'foo'
,
[],
[],
[],
[],
[
'foo'
=>
'bar'
]);
self
::
assertTrue
(
$table
->
hasOption
(
'foo'
));
self
::
assertEquals
(
'bar'
,
$table
->
getOption
(
'foo'
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment