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
1f34a074
Commit
1f34a074
authored
Jan 12, 2015
by
Marco Pivetta
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #737 from deeky666/DBAL-1058-2.4
[DBAL-1058] [2.4] Fix database names introspection for SQL Server
parents
5ca7d3ca
9b859218
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
SQLServerPlatform.php
lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
+2
-2
SQLServerPlatformTest.php
...s/Doctrine/Tests/DBAL/Platforms/SQLServerPlatformTest.php
+1
-1
No files found.
lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
View file @
1f34a074
...
@@ -675,7 +675,7 @@ class SQLServerPlatform extends AbstractPlatform
...
@@ -675,7 +675,7 @@ class SQLServerPlatform extends AbstractPlatform
*/
*/
public
function
getListDatabasesSQL
()
public
function
getListDatabasesSQL
()
{
{
return
'SELECT * FROM
SYS.DATABASES
'
;
return
'SELECT * FROM
sys.databases
'
;
}
}
/**
/**
...
@@ -848,7 +848,7 @@ class SQLServerPlatform extends AbstractPlatform
...
@@ -848,7 +848,7 @@ class SQLServerPlatform extends AbstractPlatform
$pattern
=
sprintf
(
'/%s\.(%s)\s*(AS)?\s*([^,\s\)]*)/i'
,
$column
[
'table'
],
$column
[
'column'
]);
$pattern
=
sprintf
(
'/%s\.(%s)\s*(AS)?\s*([^,\s\)]*)/i'
,
$column
[
'table'
],
$column
[
'column'
]);
$overColumn
=
preg_match
(
$pattern
,
$query
,
$matches
)
$overColumn
=
preg_match
(
$pattern
,
$query
,
$matches
)
?
(
$column
[
'hasTable'
]
?
$column
[
'table'
]
.
'.'
:
''
)
.
$column
[
'column'
]
?
(
$column
[
'hasTable'
]
?
$column
[
'table'
]
.
'.'
:
''
)
.
$column
[
'column'
]
:
$column
[
'column'
];
:
$column
[
'column'
];
if
(
isset
(
$column
[
'sort'
]))
{
if
(
isset
(
$column
[
'sort'
]))
{
...
...
tests/Doctrine/Tests/DBAL/Platforms/SQLServerPlatformTest.php
View file @
1f34a074
...
@@ -84,7 +84,7 @@ class SQLServerPlatformTest extends AbstractPlatformTestCase
...
@@ -84,7 +84,7 @@ class SQLServerPlatformTest extends AbstractPlatformTestCase
{
{
$dropDatabaseExpectation
=
'DROP DATABASE foobar'
;
$dropDatabaseExpectation
=
'DROP DATABASE foobar'
;
$this
->
assertEquals
(
'SELECT * FROM
SYS.DATABASES
'
,
$this
->
_platform
->
getListDatabasesSQL
());
$this
->
assertEquals
(
'SELECT * FROM
sys.databases
'
,
$this
->
_platform
->
getListDatabasesSQL
());
$this
->
assertEquals
(
'CREATE DATABASE foobar'
,
$this
->
_platform
->
getCreateDatabaseSQL
(
'foobar'
));
$this
->
assertEquals
(
'CREATE DATABASE foobar'
,
$this
->
_platform
->
getCreateDatabaseSQL
(
'foobar'
));
$this
->
assertEquals
(
$dropDatabaseExpectation
,
$this
->
_platform
->
getDropDatabaseSQL
(
'foobar'
));
$this
->
assertEquals
(
$dropDatabaseExpectation
,
$this
->
_platform
->
getDropDatabaseSQL
(
'foobar'
));
$this
->
assertEquals
(
'DROP TABLE foobar'
,
$this
->
_platform
->
getDropTableSQL
(
'foobar'
));
$this
->
assertEquals
(
'DROP TABLE foobar'
,
$this
->
_platform
->
getDropTableSQL
(
'foobar'
));
...
...
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