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
7331fdbf
Commit
7331fdbf
authored
Nov 25, 2012
by
Benjamin Eberlei
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/2.2' into 2.2
parents
22fbf520
912c2de3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
PostgreSqlPlatform.php
lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
+5
-0
MySqlSchemaManager.php
lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
+2
-8
No files found.
lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
View file @
7331fdbf
...
@@ -445,6 +445,11 @@ class PostgreSqlPlatform extends AbstractPlatform
...
@@ -445,6 +445,11 @@ class PostgreSqlPlatform extends AbstractPlatform
if
(
$columnDiff
->
hasChanged
(
'comment'
)
&&
$comment
=
$this
->
getColumnComment
(
$column
))
{
if
(
$columnDiff
->
hasChanged
(
'comment'
)
&&
$comment
=
$this
->
getColumnComment
(
$column
))
{
$commentsSQL
[]
=
$this
->
getCommentOnColumnSQL
(
$diff
->
name
,
$column
->
getName
(),
$comment
);
$commentsSQL
[]
=
$this
->
getCommentOnColumnSQL
(
$diff
->
name
,
$column
->
getName
(),
$comment
);
}
}
if
(
$columnDiff
->
hasChanged
(
'length'
))
{
$query
=
'ALTER '
.
$column
->
getName
()
.
' TYPE '
.
$column
->
getType
()
->
getSqlDeclaration
(
$column
->
toArray
(),
$this
);
$sql
[]
=
'ALTER TABLE '
.
$diff
->
name
.
' '
.
$query
;
}
}
}
foreach
(
$diff
->
renamedColumns
as
$oldColumnName
=>
$column
)
{
foreach
(
$diff
->
renamedColumns
as
$oldColumnName
=>
$column
)
{
...
...
lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
View file @
7331fdbf
...
@@ -141,17 +141,11 @@ class MySqlSchemaManager extends AbstractSchemaManager
...
@@ -141,17 +141,11 @@ class MySqlSchemaManager extends AbstractSchemaManager
}
}
$length
=
((
int
)
$length
==
0
)
?
null
:
(
int
)
$length
;
$length
=
((
int
)
$length
==
0
)
?
null
:
(
int
)
$length
;
$def
=
array
(
'type'
=>
$type
,
'length'
=>
$length
,
'unsigned'
=>
(
bool
)
$unsigned
,
'fixed'
=>
(
bool
)
$fixed
);
$options
=
array
(
$options
=
array
(
'length'
=>
$length
,
'length'
=>
$length
,
'unsigned'
=>
(
bool
)
$unsigned
,
'unsigned'
=>
(
bool
)
(
strpos
(
$tableColumn
[
'type'
],
'unsigned'
)
!==
false
)
,
'fixed'
=>
(
bool
)
$fixed
,
'fixed'
=>
(
bool
)
$fixed
,
'default'
=>
isset
(
$tableColumn
[
'default'
])
?
$tableColumn
[
'default'
]
:
null
,
'default'
=>
isset
(
$tableColumn
[
'default'
])
?
$tableColumn
[
'default'
]
:
null
,
'notnull'
=>
(
bool
)
(
$tableColumn
[
'null'
]
!=
'YES'
),
'notnull'
=>
(
bool
)
(
$tableColumn
[
'null'
]
!=
'YES'
),
'scale'
=>
null
,
'scale'
=>
null
,
...
...
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