From fe186e8613d87fa730fd85d6d0195e930091e756 Mon Sep 17 00:00:00 2001 From: Tyler Rooney Date: Fri, 27 Jan 2012 21:32:00 -0400 Subject: [PATCH] Various updates to bring Driver and Connection in line with existing Doctrine DBAL. --- .gitignore | 7 +++++++ Doctrine/DBAL/Driver/PDODblib/Connection.php | 2 +- Doctrine/DBAL/Driver/PDODblib/Driver.php | 9 +++++---- 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c573a58 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +*~ +*.lock +*.DS_Store +*.swp +*.out +.idea/ + diff --git a/Doctrine/DBAL/Driver/PDODblib/Connection.php b/Doctrine/DBAL/Driver/PDODblib/Connection.php index 3b943ea..0b90dfb 100644 --- a/Doctrine/DBAL/Driver/PDODblib/Connection.php +++ b/Doctrine/DBAL/Driver/PDODblib/Connection.php @@ -19,7 +19,7 @@ * . */ -namespace PDODblibBundle\Doctrine\DBAL\Driver\PDODblib; +namespace Doctrine\DBAL\Driver\PDODblib; /** * PDODblib Connection implementation. diff --git a/Doctrine/DBAL/Driver/PDODblib/Driver.php b/Doctrine/DBAL/Driver/PDODblib/Driver.php index 390ff6a..63711f2 100644 --- a/Doctrine/DBAL/Driver/PDODblib/Driver.php +++ b/Doctrine/DBAL/Driver/PDODblib/Driver.php @@ -19,7 +19,7 @@ * . */ -namespace PDODblibBundle\Doctrine\DBAL\Driver\PDODblib; +namespace Doctrine\DBAL\Driver\PDODblib; /** * The PDO-based Dblib driver. @@ -59,19 +59,20 @@ private function _constructPdoDsn(array $params) if (isset($params['dbname'])) { $dsn .= ';dbname=' . $params['dbname']; } - return $dsn; } public function getDatabasePlatform() { - return new \Doctrine\DBAL\Platforms\MsSqlPlatform(); + //return new \Doctrine\DBAL\Platforms\MsSqlPlatform(); + return new \Doctrine\DBAL\Platforms\SQLServer2005Platform(); } public function getSchemaManager(\Doctrine\DBAL\Connection $conn) { - return new \Doctrine\DBAL\Schema\MsSqlSchemaManager($conn); + //return new \Doctrine\DBAL\Schema\MsSqlSchemaManager($conn); + return new \Doctrine\DBAL\Schema\SQLServerSchemaManager($conn); } public function getName()