From 11027e25733ffeabf8dd057de0bca9ec247c3d2e Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 22 Oct 2015 01:53:41 +0200
Subject: [PATCH] MsSql2005 driver renamed to Sqlsrv

---
 examples/connecting-to-databases.php                   |  6 +++---
 .../Drivers/{MsSql2005Driver.php => SqlsrvDriver.php}  |  6 +++---
 .../{MsSql2005Reflector.php => SqlsrvReflector.php}    |  4 ++--
 src/loader.php                                         | 10 ++++++----
 tests/databases.sample.ini                             |  4 ++--
 5 files changed, 16 insertions(+), 14 deletions(-)
 rename src/Dibi/Drivers/{MsSql2005Driver.php => SqlsrvDriver.php} (98%)
 rename src/Dibi/Drivers/{MsSql2005Reflector.php => SqlsrvReflector.php} (97%)

diff --git a/examples/connecting-to-databases.php b/examples/connecting-to-databases.php
index 34c99a8b..49497b98 100644
--- a/examples/connecting-to-databases.php
+++ b/examples/connecting-to-databases.php
@@ -128,11 +128,11 @@ try {
 echo "</p>\n";
 
 
-// connects to MS SQL 2005
-echo '<p>Connecting to MS SQL 2005: ';
+// connects to SQLSRV
+echo '<p>Connecting to SQLSRV: ';
 try {
 	dibi::connect([
-		'driver' => 'mssql2005',
+		'driver' => 'sqlsrv',
 		'host' => '(local)',
 		'username' => 'Administrator',
 		'password' => 'xxx',
diff --git a/src/Dibi/Drivers/MsSql2005Driver.php b/src/Dibi/Drivers/SqlsrvDriver.php
similarity index 98%
rename from src/Dibi/Drivers/MsSql2005Driver.php
rename to src/Dibi/Drivers/SqlsrvDriver.php
index 484d6b98..b8bfd65b 100644
--- a/src/Dibi/Drivers/MsSql2005Driver.php
+++ b/src/Dibi/Drivers/SqlsrvDriver.php
@@ -12,7 +12,7 @@ use Dibi\Connection;
 
 
 /**
- * The dibi driver for MS SQL Driver 2005 database.
+ * The dibi driver for SQLSRV database.
  *
  * Driver options:
  *   - host => the MS SQL server host name. It can also include a port number (hostname:port)
@@ -24,7 +24,7 @@ use Dibi\Connection;
  *   - resource (resource) => existing connection resource
  *   - lazy, profiler, result, substitutes, ... => see Dibi\Connection options
  */
-class MsSql2005Driver implements Dibi\Driver, Dibi\ResultDriver
+class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
@@ -192,7 +192,7 @@ class MsSql2005Driver implements Dibi\Driver, Dibi\ResultDriver
 	 */
 	public function getReflector()
 	{
-		return new Mssql2005Reflector($this);
+		return new SqlsrvReflector($this);
 	}
 
 
diff --git a/src/Dibi/Drivers/MsSql2005Reflector.php b/src/Dibi/Drivers/SqlsrvReflector.php
similarity index 97%
rename from src/Dibi/Drivers/MsSql2005Reflector.php
rename to src/Dibi/Drivers/SqlsrvReflector.php
index 73958c16..edc515be 100644
--- a/src/Dibi/Drivers/MsSql2005Reflector.php
+++ b/src/Dibi/Drivers/SqlsrvReflector.php
@@ -11,10 +11,10 @@ use Dibi;
 
 
 /**
- * The dibi reflector for MSSQL2005 databases.
+ * The dibi reflector for SQLSRV databases.
  * @internal
  */
-class MsSql2005Reflector implements Dibi\Reflector
+class SqlsrvReflector implements Dibi\Reflector
 {
 	use Dibi\Strict;
 
diff --git a/src/loader.php b/src/loader.php
index 248395b2..71aa55df 100644
--- a/src/loader.php
+++ b/src/loader.php
@@ -24,8 +24,8 @@ spl_autoload_register(function ($class) {
 		'Dibi\Driver' => 'interfaces.php',
 		'Dibi\DriverException' => 'exceptions.php',
 		'Dibi\Drivers\FirebirdDriver' => 'Drivers/FirebirdDriver.php',
-		'Dibi\Drivers\MsSql2005Driver' => 'Drivers/MsSql2005Driver.php',
-		'Dibi\Drivers\MsSql2005Reflector' => 'Drivers/MsSql2005Reflector.php',
+		'Dibi\Drivers\SqlsrvDriver' => 'Drivers/SqlsrvDriver.php',
+		'Dibi\Drivers\SqlsrvReflector' => 'Drivers/SqlsrvReflector.php',
 		'Dibi\Drivers\MsSqlDriver' => 'Drivers/MsSqlDriver.php',
 		'Dibi\Drivers\MsSqlReflector' => 'Drivers/MsSqlReflector.php',
 		'Dibi\Drivers\MySqlDriver' => 'Drivers/MySqlDriver.php',
@@ -84,8 +84,8 @@ spl_autoload_register(function ($class) {
 		'DibiHashMapBase' => 'Dibi\HashMapBase',
 		'DibiIndexInfo' => 'Dibi\Reflection\Index',
 		'DibiLiteral' => 'Dibi\Literal',
-		'DibiMsSql2005Driver' => 'Dibi\Drivers\MsSql2005Driver',
-		'DibiMsSql2005Reflector' => 'Dibi\Drivers\MsSql2005Reflector',
+		'DibiMsSql2005Driver' => 'Dibi\Drivers\SqlsrvDriver',
+		'DibiMsSql2005Reflector' => 'Dibi\Drivers\SqlsrvReflector',
 		'DibiMsSqlDriver' => 'Dibi\Drivers\MsSqlDriver',
 		'DibiMsSqlReflector' => 'Dibi\Drivers\MsSqlReflector',
 		'DibiMySqlDriver' => 'Dibi\Drivers\MySqlDriver',
@@ -113,6 +113,8 @@ spl_autoload_register(function ($class) {
 		'IDibiDriver' => 'Dibi\Driver',
 		'IDibiReflector' => 'Dibi\Reflector',
 		'IDibiResultDriver' => 'Dibi\ResultDriver',
+		'Dibi\Drivers\MsSql2005Driver' => 'Dibi\Drivers\SqlsrvDriver',
+		'Dibi\Drivers\MsSql2005Reflector' => 'Dibi\Drivers\SqlsrvReflector',
 	];
 	if (isset($map[$class])) {
 		require __DIR__ . '/Dibi/' . $map[$class];
diff --git a/tests/databases.sample.ini b/tests/databases.sample.ini
index 1915dfa3..48f2d506 100644
--- a/tests/databases.sample.ini
+++ b/tests/databases.sample.ini
@@ -38,8 +38,8 @@ username = dibi
 password =
 system = mssql
 
-[mssql2005]
-driver = mssql2005
+[sqlsrv]
+driver = sqlsrv
 host = (local)
 username = dibi
 password =