Skip to content

Commit 167ab40

Browse files
authored
Merge pull request #4023 from mostafakhudair/rename-sqlsrv
Rename Sqlsrv driver
2 parents fa11eb1 + eea8483 commit 167ab40

File tree

18 files changed

+115
-304
lines changed

18 files changed

+115
-304
lines changed

.github/workflows/test-phpunit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
fail-fast: false
4242
matrix:
4343
php-versions: ['7.2', '7.3', '7.4']
44-
db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'Sqlsrv']
44+
db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV']
4545

4646
services:
4747
mysql:
@@ -77,7 +77,7 @@ jobs:
7777

7878
steps:
7979
- name: Create database for MSSQL Server
80-
if: ${{ matrix.db-platforms == 'Sqlsrv'}}
80+
if: ${{ matrix.db-platforms == 'SQLSRV'}}
8181
run: sqlcmd -S localhost -U sa -P 1Secure*Password1 -Q "CREATE DATABASE test"
8282

8383
- name: Checkout
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace CodeIgniter\Database\Sqlsrv;
12+
namespace CodeIgniter\Database\SQLSRV;
1313

1414
use Closure;
1515
use CodeIgniter\Database\BaseBuilder;
@@ -18,7 +18,7 @@
1818
use CodeIgniter\Database\ResultInterface;
1919

2020
/**
21-
* Builder for Sqlsrv
21+
* Builder for SQLSRV
2222
*
2323
* @todo auto check for TextCastToInt
2424
* @todo auto check for InsertIndexValue
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace CodeIgniter\Database\Sqlsrv;
12+
namespace CodeIgniter\Database\SQLSRV;
1313

1414
use CodeIgniter\Database\BaseConnection;
1515
use CodeIgniter\Database\Exceptions\DatabaseException;
1616
use Exception;
1717
use stdClass;
1818

1919
/**
20-
* Connection for Sqlsrv
20+
* Connection for SQLSRV
2121
*/
2222
class Connection extends BaseConnection
2323
{
@@ -26,7 +26,7 @@ class Connection extends BaseConnection
2626
*
2727
* @var string
2828
*/
29-
public $DBDriver = 'Sqlsrv';
29+
public $DBDriver = 'SQLSRV';
3030

3131
/**
3232
* Database name
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace CodeIgniter\Database\Sqlsrv;
12+
namespace CodeIgniter\Database\SQLSRV;
1313

1414
/**
15-
* Forge for Sqlsrv
15+
* Forge for SQLSRV
1616
*/
1717
class Forge extends \CodeIgniter\Database\Forge
1818
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace CodeIgniter\Database\Sqlsrv;
12+
namespace CodeIgniter\Database\SQLSRV;
1313

1414
use BadMethodCallException;
1515
use CodeIgniter\Database\BasePreparedQuery;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace CodeIgniter\Database\Sqlsrv;
12+
namespace CodeIgniter\Database\SQLSRV;
1313

1414
use CodeIgniter\Database\BaseResult;
1515
use CodeIgniter\Entity;
1616
use stdClass;
1717

1818
/**
19-
* Result for Sqlsrv
19+
* Result for SQLSRV
2020
*/
2121
class Result extends BaseResult
2222
{
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace CodeIgniter\Database\Sqlsrv;
12+
namespace CodeIgniter\Database\SQLSRV;
1313

1414
use CodeIgniter\Database\BaseUtils;
1515
use CodeIgniter\Database\Exceptions\DatabaseException;
1616

1717
/**
18-
* Utils for Sqlsrv
18+
* Utils for SQLSRV
1919
*/
2020
class Utils extends BaseUtils
2121
{

tests/_support/Config/Registrar.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php namespace Tests\Support\Config;
1+
<?php
2+
3+
namespace Tests\Support\Config;
24

35
/**
46
* Class Registrar
@@ -71,13 +73,13 @@ class Registrar
7173
'failover' => [],
7274
'port' => 3306,
7375
],
74-
'Sqlsrv' => [
76+
'SQLSRV' => [
7577
'DSN' => '',
7678
'hostname' => 'localhost',
7779
'username' => 'sa',
7880
'password' => '1Secure*Password1',
7981
'database' => 'test',
80-
'DBDriver' => 'Sqlsrv',
82+
'DBDriver' => 'SQLSRV',
8183
'DBPrefix' => 'db_',
8284
'pConnect' => false,
8385
'DBDebug' => (ENVIRONMENT !== 'production'),

0 commit comments

Comments
 (0)