Merge pull request #4023 from mostafakhudair/rename-sqlsrv

Rename Sqlsrv driver
codeigniter4 · Dec 27, 2020 · 167ab40 · 167ab40
2 parents fa11eb1 + eea8483
commit 167ab40
Show file tree

Hide file tree

Showing 18 changed files with 115 additions and 304 deletions.
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
@@ -41,7 +41,7 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['7.2', '7.3', '7.4']
-        db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'Sqlsrv']
+        db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV']
 
     services:
       mysql:
@@ -77,7 +77,7 @@ jobs:
 
     steps:
       - name: Create database for MSSQL Server
-        if: ${{ matrix.db-platforms == 'Sqlsrv'}}
+        if: ${{ matrix.db-platforms == 'SQLSRV'}}
         run: sqlcmd -S localhost -U sa -P 1Secure*Password1 -Q "CREATE DATABASE test"
 
       - name: Checkout

diff --git a/system/Database/Sqlsrv/Builder.php → system/Database/SQLSRV/Builder.php b/system/Database/Sqlsrv/Builder.php → system/Database/SQLSRV/Builder.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CodeIgniter\Database\Sqlsrv;
+namespace CodeIgniter\Database\SQLSRV;
 
 use Closure;
 use CodeIgniter\Database\BaseBuilder;
@@ -18,7 +18,7 @@
 use CodeIgniter\Database\ResultInterface;
 
 /**
- * Builder for Sqlsrv
+ * Builder for SQLSRV
  *
  * @todo auto check for TextCastToInt
  * @todo auto check for InsertIndexValue

diff --git a/system/Database/Sqlsrv/Connection.php → system/Database/SQLSRV/Connection.php b/system/Database/Sqlsrv/Connection.php → system/Database/SQLSRV/Connection.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace CodeIgniter\Database\Sqlsrv;
+namespace CodeIgniter\Database\SQLSRV;
 
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use Exception;
 use stdClass;
 
 /**
- * Connection for Sqlsrv
+ * Connection for SQLSRV
  */
 class Connection extends BaseConnection
 {
@@ -26,7 +26,7 @@ class Connection extends BaseConnection
 	 *
 	 * @var string
 	 */
-	public $DBDriver = 'Sqlsrv';
+	public $DBDriver = 'SQLSRV';
 
 	/**
 	 * Database name

diff --git a/system/Database/Sqlsrv/Forge.php → system/Database/SQLSRV/Forge.php b/system/Database/Sqlsrv/Forge.php → system/Database/SQLSRV/Forge.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace CodeIgniter\Database\Sqlsrv;
+namespace CodeIgniter\Database\SQLSRV;
 
 /**
- * Forge for Sqlsrv
+ * Forge for SQLSRV
  */
 class Forge extends \CodeIgniter\Database\Forge
 {

diff --git a/system/Database/Sqlsrv/PreparedQuery.php → system/Database/SQLSRV/PreparedQuery.php b/system/Database/Sqlsrv/PreparedQuery.php → system/Database/SQLSRV/PreparedQuery.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CodeIgniter\Database\Sqlsrv;
+namespace CodeIgniter\Database\SQLSRV;
 
 use BadMethodCallException;
 use CodeIgniter\Database\BasePreparedQuery;

diff --git a/system/Database/Sqlsrv/Result.php → system/Database/SQLSRV/Result.php b/system/Database/Sqlsrv/Result.php → system/Database/SQLSRV/Result.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace CodeIgniter\Database\Sqlsrv;
+namespace CodeIgniter\Database\SQLSRV;
 
 use CodeIgniter\Database\BaseResult;
 use CodeIgniter\Entity;
 use stdClass;
 
 /**
- * Result for Sqlsrv
+ * Result for SQLSRV
  */
 class Result extends BaseResult
 {

diff --git a/system/Database/Sqlsrv/Utils.php → system/Database/SQLSRV/Utils.php b/system/Database/Sqlsrv/Utils.php → system/Database/SQLSRV/Utils.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace CodeIgniter\Database\Sqlsrv;
+namespace CodeIgniter\Database\SQLSRV;
 
 use CodeIgniter\Database\BaseUtils;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 
 /**
- * Utils for Sqlsrv
+ * Utils for SQLSRV
  */
 class Utils extends BaseUtils
 {

diff --git a/tests/_support/Config/Registrar.php b/tests/_support/Config/Registrar.php
@@ -1,4 +1,6 @@
-<?php namespace Tests\Support\Config;
+<?php
+
+namespace Tests\Support\Config;
 
 /**
  * Class Registrar
@@ -71,13 +73,13 @@ class Registrar
 			'failover' => [],
 			'port'     => 3306,
 		],
-		'Sqlsrv'  => [
+		'SQLSRV'  => [
 			'DSN'      => '',
 			'hostname' => 'localhost',
 			'username' => 'sa',
 			'password' => '1Secure*Password1',
 			'database' => 'test',
-			'DBDriver' => 'Sqlsrv',
+			'DBDriver' => 'SQLSRV',
 			'DBPrefix' => 'db_',
 			'pConnect' => false,
 			'DBDebug'  => (ENVIRONMENT !== 'production'),