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
2be8242a
Commit
2be8242a
authored
Apr 30, 2015
by
Steve Müller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix retrieving the database name connected to for SQL Server
parent
41e718ea
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
81 additions
and
1 deletion
+81
-1
AbstractSQLServerDriver.php
lib/Doctrine/DBAL/Driver/AbstractSQLServerDriver.php
+5
-1
Driver.php
...octrine/Tests/DBAL/Functional/Driver/PDOSqlsrv/Driver.php
+38
-0
Driver.php
...s/Doctrine/Tests/DBAL/Functional/Driver/SQLSrv/Driver.php
+38
-0
No files found.
lib/Doctrine/DBAL/Driver/AbstractSQLServerDriver.php
View file @
2be8242a
...
@@ -78,9 +78,13 @@ abstract class AbstractSQLServerDriver implements Driver, VersionAwarePlatformDr
...
@@ -78,9 +78,13 @@ abstract class AbstractSQLServerDriver implements Driver, VersionAwarePlatformDr
{
{
$params
=
$conn
->
getParams
();
$params
=
$conn
->
getParams
();
if
(
isset
(
$params
[
'dbname'
]))
{
return
$params
[
'dbname'
];
return
$params
[
'dbname'
];
}
}
return
$conn
->
query
(
'SELECT DB_NAME()'
)
->
fetchColumn
();
}
/**
/**
* {@inheritdoc}
* {@inheritdoc}
*/
*/
...
...
tests/Doctrine/Tests/DBAL/Functional/Driver/PDOSqlsrv/Driver.php
0 → 100644
View file @
2be8242a
<?php
namespace
Doctrine\Tests\DBAL\Functional\Driver\PDOSqlsrv
;
use
Doctrine\DBAL\Driver\PDOSqlsrv\Driver
;
use
Doctrine\Tests\DBAL\Functional\Driver\AbstractDriverTest
;
class
DriverTest
extends
AbstractDriverTest
{
protected
function
setUp
()
{
if
(
!
extension_loaded
(
'pdo_sqlsrv'
))
{
$this
->
markTestSkipped
(
'pdo_sqlsrv is not installed.'
);
}
parent
::
setUp
();
if
(
!
$this
->
_conn
->
getDriver
()
instanceof
Driver
)
{
$this
->
markTestSkipped
(
'pdo_sqlsrv only test.'
);
}
}
/**
* {@inheritdoc}
*/
protected
function
createDriver
()
{
return
new
Driver
();
}
/**
* {@inheritdoc}
*/
protected
function
getDatabaseNameForConnectionWithoutDatabaseNameParameter
()
{
return
'master'
;
}
}
tests/Doctrine/Tests/DBAL/Functional/Driver/SQLSrv/Driver.php
0 → 100644
View file @
2be8242a
<?php
namespace
Doctrine\Tests\DBAL\Functional\Driver\SQLSrv
;
use
Doctrine\DBAL\Driver\SQLSrv\Driver
;
use
Doctrine\Tests\DBAL\Functional\Driver\AbstractDriverTest
;
class
DriverTest
extends
AbstractDriverTest
{
protected
function
setUp
()
{
if
(
!
extension_loaded
(
'sqlsrv'
))
{
$this
->
markTestSkipped
(
'sqlsrv is not installed.'
);
}
parent
::
setUp
();
if
(
!
$this
->
_conn
->
getDriver
()
instanceof
Driver
)
{
$this
->
markTestSkipped
(
'sqlsrv only test.'
);
}
}
/**
* {@inheritdoc}
*/
protected
function
createDriver
()
{
return
new
Driver
();
}
/**
* {@inheritdoc}
*/
protected
function
getDatabaseNameForConnectionWithoutDatabaseNameParameter
()
{
return
'master'
;
}
}
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