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
d16c92b4
Unverified
Commit
d16c92b4
authored
Dec 27, 2018
by
Sergei Morozov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bpo/2.9/#3412' into 2.9
parents
dac7d607
b8c5bee2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
MySqlSchemaManager.php
lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
+2
-2
MySqlSchemaManagerTest.php
...e/Tests/DBAL/Functional/Schema/MySqlSchemaManagerTest.php
+7
-0
No files found.
lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
View file @
d16c92b4
...
@@ -312,11 +312,11 @@ class MySqlSchemaManager extends AbstractSchemaManager
...
@@ -312,11 +312,11 @@ class MySqlSchemaManager extends AbstractSchemaManager
/**
/**
* @return string[]|true[]
* @return string[]|true[]
*/
*/
private
function
parseCreateOptions
(
string
$string
)
:
array
private
function
parseCreateOptions
(
?
string
$string
)
:
array
{
{
$options
=
[];
$options
=
[];
if
(
$string
===
''
)
{
if
(
$string
===
null
||
$string
===
''
)
{
return
$options
;
return
$options
;
}
}
...
...
tests/Doctrine/Tests/DBAL/Functional/Schema/MySqlSchemaManagerTest.php
View file @
d16c92b4
...
@@ -531,4 +531,11 @@ SQL;
...
@@ -531,4 +531,11 @@ SQL;
self
::
assertEquals
(
''
,
$onlineTable
->
getOption
(
'comment'
));
self
::
assertEquals
(
''
,
$onlineTable
->
getOption
(
'comment'
));
self
::
assertEquals
([],
$onlineTable
->
getOption
(
'create_options'
));
self
::
assertEquals
([],
$onlineTable
->
getOption
(
'create_options'
));
}
}
public
function
testParseNullCreateOptions
()
:
void
{
$table
=
$this
->
schemaManager
->
listTableDetails
(
'sys.processlist'
);
self
::
assertEquals
([],
$table
->
getOption
(
'create_options'
));
}
}
}
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