Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename Sqlsrv driver #4023

Merged
merged 1 commit into from
Dec 27, 2020
Merged

Rename Sqlsrv driver #4023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test-phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions system/Database/Sqlsrv/Builder.php → system/Database/SQLSRV/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -18,7 +18,7 @@
use CodeIgniter\Database\ResultInterface;

/**
* Builder for Sqlsrv
* Builder for SQLSRV
*
* @todo auto check for TextCastToInt
* @todo auto check for InsertIndexValue
Expand Down
6 changes: 3 additions & 3 deletions system/Database/Sqlsrv/Connection.php → system/Database/SQLSRV/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -26,7 +26,7 @@ class Connection extends BaseConnection
*
* @var string
*/
public $DBDriver = 'Sqlsrv';
public $DBDriver = 'SQLSRV';

/**
* Database name
Expand Down
4 changes: 2 additions & 2 deletions system/Database/Sqlsrv/Forge.php → system/Database/SQLSRV/Forge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion system/Database/Sqlsrv/PreparedQuery.php → system/Database/SQLSRV/PreparedQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions system/Database/Sqlsrv/Result.php → system/Database/SQLSRV/Result.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions system/Database/Sqlsrv/Utils.php → system/Database/SQLSRV/Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
8 changes: 5 additions & 3 deletions tests/_support/Config/Registrar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace Tests\Support\Config;
<?php

namespace Tests\Support\Config;

/**
* Class Registrar
Expand Down Expand Up @@ -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'),
Expand Down
Loading