diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66adb433..1b86df23 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: env: COMPOSER_ROOT_VERSION: 1.0.0 - EXTENSIONS: pdo, pdo_sqlsrv-5.10.1 + EXTENSIONS: pdo, pdo_sqlsrv-5.12 runs-on: ${{ matrix.mssql.os || 'ubuntu-latest' }} @@ -63,6 +63,11 @@ jobs: options: --name=mssql --health-cmd="/opt/mssql-tools${{ matrix.mssql.odbc-version }}/bin/sqlcmd ${{ matrix.mssql.flag }} -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'SELECT 1'" --health-interval=10s --health-timeout=5s --health-retries=3 steps: + - name: Install ODBC driver. + run: | + sudo curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 + - name: Checkout. uses: actions/checkout@v3 diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index 81bbe8ec..825b2828 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -20,7 +20,7 @@ jobs: env: COMPOSER_ROOT_VERSION: 1.0.0 - EXTENSIONS: pdo, pdo_sqlsrv-5.10.1 + EXTENSIONS: pdo, pdo_sqlsrv-5.12 runs-on: ${{ matrix.os }} @@ -44,6 +44,11 @@ jobs: options: --name=mssql --health-cmd="/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -C -Q 'SELECT 1'" --health-interval=10s --health-timeout=5s --health-retries=3 steps: + - name: Install ODBC driver. + run: | + sudo curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 + - name: Checkout. uses: actions/checkout@v3 diff --git a/src/Dsn.php b/src/Dsn.php index 6bcb7419..5050bc75 100644 --- a/src/Dsn.php +++ b/src/Dsn.php @@ -13,13 +13,17 @@ */ final class Dsn extends AbstractDsn { + /** + * @psalm-param array $options + */ public function __construct( - private string $driver, - private string $host, - private string|null $databaseName = null, - private string $port = '1433' + string $driver = 'sqlsrv', + string $host = 'localhost', + string|null $databaseName = null, + string|null $port = '1433', + array $options = [] ) { - parent::__construct($driver, $host, $databaseName, $port); + parent::__construct($driver, $host, $databaseName, $port, $options); } /** @@ -39,16 +43,26 @@ public function __construct( */ public function asString(): string { - if ($this->port !== '') { - $server = "Server=$this->host,$this->port;"; - } else { - $server = "Server=$this->host;"; + $driver = $this->getDriver(); + $host = $this->getHost(); + $port = $this->getPort(); + $databaseName = $this->getDatabaseName(); + $options = $this->getOptions(); + + $dsn = "$driver:Server=$host"; + + if (!empty($port)) { + $dsn .= ",$port"; + } + + if (!empty($databaseName)) { + $dsn .= ";Database=$databaseName"; } - if (!empty($this->databaseName)) { - $dsn = "$this->driver:" . $server . "Database=$this->databaseName"; - } else { - $dsn = "$this->driver:" . $server; + if (!empty($options)) { + foreach ($options as $key => $value) { + $dsn .= ";$key=$value"; + } } return $dsn; diff --git a/tests/CommandTest.php b/tests/CommandTest.php index 607c632d..560521e4 100644 --- a/tests/CommandTest.php +++ b/tests/CommandTest.php @@ -313,7 +313,7 @@ public function testDropDefaultValueSql(): void public function testShowDatabases(): void { - $dsn = new Dsn('sqlsrv', 'localhost'); + $dsn = new Dsn(options: ['Encrypt' => 'no']); $db = new Connection( new Driver($dsn->asString(), 'SA', 'YourStrong!Passw0rd'), DbHelper::getSchemaCache(), @@ -321,7 +321,7 @@ public function testShowDatabases(): void $command = $db->createCommand(); - $this->assertSame('sqlsrv:Server=localhost,1433;', $db->getDriver()->getDsn()); + $this->assertSame('sqlsrv:Server=localhost,1433;Encrypt=no', $db->getDriver()->getDsn()); $this->assertSame(['yiitest'], $command->showDatabases()); } diff --git a/tests/DsnTest.php b/tests/DsnTest.php index 719c66f2..0a2c07c0 100644 --- a/tests/DsnTest.php +++ b/tests/DsnTest.php @@ -24,17 +24,17 @@ public function testAsString(): void public function testAsStringWithDatabaseName(): void { - $this->assertSame('sqlsrv:Server=127.0.0.1,1433;', (new Dsn('sqlsrv', '127.0.0.1'))->asString()); + $this->assertSame('sqlsrv:Server=127.0.0.1,1433', (new Dsn('sqlsrv', '127.0.0.1'))->asString()); } public function testAsStringWithDatabaseNameWithEmptyString(): void { - $this->assertSame('sqlsrv:Server=127.0.0.1,1433;', (new Dsn('sqlsrv', '127.0.0.1', ''))->asString()); + $this->assertSame('sqlsrv:Server=127.0.0.1,1433', (new Dsn('sqlsrv', '127.0.0.1', ''))->asString()); } public function testAsStringWithDatabaseNameWithNull(): void { - $this->assertSame('sqlsrv:Server=127.0.0.1,1433;', (new Dsn('sqlsrv', '127.0.0.1', null))->asString()); + $this->assertSame('sqlsrv:Server=127.0.0.1,1433', (new Dsn('sqlsrv', '127.0.0.1', null))->asString()); } public function testAsStringWithEmptyPort(): void diff --git a/tests/Support/TestTrait.php b/tests/Support/TestTrait.php index 3f77c031..517caedc 100644 --- a/tests/Support/TestTrait.php +++ b/tests/Support/TestTrait.php @@ -37,7 +37,7 @@ protected function getConnection(bool $fixture = false): PdoConnectionInterface protected static function getDb(): PdoConnectionInterface { - $dsn = (new Dsn('sqlsrv', 'localhost', 'yiitest'))->asString(); + $dsn = (new Dsn(databaseName: 'yiitest', options: ['Encrypt' => 'no']))->asString(); return new Connection( new Driver($dsn, 'SA', 'YourStrong!Passw0rd'), @@ -48,7 +48,7 @@ protected static function getDb(): PdoConnectionInterface protected function getDsn(): string { if ($this->dsn === '') { - $this->dsn = (new Dsn('sqlsrv', 'localhost', 'yiitest'))->asString(); + $this->dsn = (new Dsn(databaseName: 'yiitest', options: ['Encrypt' => 'no']))->asString(); } return $this->dsn; diff --git a/tests/Type/CharTest.php b/tests/Type/CharTest.php index e1bf61da..071b9379 100644 --- a/tests/Type/CharTest.php +++ b/tests/Type/CharTest.php @@ -191,7 +191,7 @@ public function testValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - '[ODBC Driver 17 for SQL Server][SQL Server]String or binary data would be truncated' + '[SQL Server]String or binary data would be truncated' ); $command->insert('char', ['Mychar1' => '01234567891'])->execute(); diff --git a/tests/Type/DateTest.php b/tests/Type/DateTest.php index 042745d3..f8e9b9e8 100644 --- a/tests/Type/DateTest.php +++ b/tests/Type/DateTest.php @@ -191,7 +191,7 @@ public function testValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22007]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Conversion failed when converting date and/or time from character string.' + '[SQL Server]Conversion failed when converting date and/or time from character string.' ); $db->createCommand()->insert('date', ['Mydate1' => '0000-00-00'])->execute(); diff --git a/tests/Type/DecimalTest.php b/tests/Type/DecimalTest.php index f11d4011..d5ade435 100644 --- a/tests/Type/DecimalTest.php +++ b/tests/Type/DecimalTest.php @@ -189,7 +189,7 @@ public function testMaxValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - "SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]The number '199999999999999997748809823456034029570' is out of the range for numeric representation (maximum precision 38)." + "[SQL Server]The number '199999999999999997748809823456034029570' is out of the range for numeric representation (maximum precision 38)." ); $command->insert( @@ -266,7 +266,7 @@ public function testMinValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - "SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]The number '199999999999999997748809823456034029570' is out of the range for numeric representation (maximum precision 38)." + "[SQL Server]The number '199999999999999997748809823456034029570' is out of the range for numeric representation (maximum precision 38)." ); $command->insert( diff --git a/tests/Type/FloatTest.php b/tests/Type/FloatTest.php index 110fe119..d9653fca 100644 --- a/tests/Type/FloatTest.php +++ b/tests/Type/FloatTest.php @@ -186,7 +186,7 @@ public function testMaxValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - "SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]The floating point value '1.80E+308' is out of the range of computer representation (8 bytes)." + "[SQL Server]The floating point value '1.80E+308' is out of the range of computer representation (8 bytes)." ); $command->insert('float', ['Myfloat1' => new Expression('1.80E+308')])->execute(); @@ -256,7 +256,7 @@ public function testMinValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - "SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]The floating point value '1.80E+308' is out of the range of computer representation (8 bytes)." + "[SQL Server]The floating point value '1.80E+308' is out of the range of computer representation (8 bytes)." ); $command->insert('float', ['Myfloat1' => new Expression('-1.80E+308')])->execute(); diff --git a/tests/Type/IntTest.php b/tests/Type/IntTest.php index 4d513f97..9444cebf 100644 --- a/tests/Type/IntTest.php +++ b/tests/Type/IntTest.php @@ -182,7 +182,7 @@ public function testMaxValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow' + '[SQL Server]Arithmetic overflow' ); $command->insert('int', ['Myint1' => 2_147_483_648])->execute(); @@ -252,7 +252,7 @@ public function testMinValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow' + '[SQL Server]Arithmetic overflow' ); $command->insert('int', ['Myint1' => -2_147_483_649])->execute(); diff --git a/tests/Type/MoneyTest.php b/tests/Type/MoneyTest.php index e6998383..b7cee0ad 100644 --- a/tests/Type/MoneyTest.php +++ b/tests/Type/MoneyTest.php @@ -182,7 +182,7 @@ public function testMaxValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow error converting expression to data type money.' + '[SQL Server]Arithmetic overflow error converting expression to data type money.' ); $command->insert('money', ['Mymoney1' => '922337203685478.5808'])->execute(); @@ -252,7 +252,7 @@ public function testMinValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow error converting expression to data type money.' + '[SQL Server]Arithmetic overflow error converting expression to data type money.' ); $command->insert('money', ['Mymoney1' => '-922337203685480.5808'])->execute(); diff --git a/tests/Type/NumericTest.php b/tests/Type/NumericTest.php index 36470b7f..073a1f88 100644 --- a/tests/Type/NumericTest.php +++ b/tests/Type/NumericTest.php @@ -245,7 +245,7 @@ public function testMinValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - "SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]The number '199999999999999997748809823456034029570' is out of the range for numeric representation (maximum precision 38)." + "[SQL Server]The number '199999999999999997748809823456034029570' is out of the range for numeric representation (maximum precision 38)." ); $command->insert( diff --git a/tests/Type/RealTest.php b/tests/Type/RealTest.php index 74ea36c9..62bfe4f6 100644 --- a/tests/Type/RealTest.php +++ b/tests/Type/RealTest.php @@ -183,7 +183,7 @@ public function testMaxValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow error for type real' + '[SQL Server]Arithmetic overflow error for type real' ); $command->insert('real', ['Myreal1' => new Expression('4.4E+38')])->execute(); @@ -253,7 +253,7 @@ public function testMinValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow error for type real' + '[SQL Server]Arithmetic overflow error for type real' ); $command->insert('real', ['Myreal1' => new Expression('-4.4E+38')])->execute(); diff --git a/tests/Type/SmallIntTest.php b/tests/Type/SmallIntTest.php index 46a01d27..f9dc0c2f 100644 --- a/tests/Type/SmallIntTest.php +++ b/tests/Type/SmallIntTest.php @@ -182,7 +182,7 @@ public function testMaxValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow' + '[SQL Server]Arithmetic overflow' ); $command->insert('smallint', ['Mysmallint1' => 32768])->execute(); @@ -252,7 +252,7 @@ public function testMinValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow' + '[SQL Server]Arithmetic overflow' ); $command->insert('smallint', ['Mysmallint1' => -32769])->execute(); diff --git a/tests/Type/SmallMoneyTest.php b/tests/Type/SmallMoneyTest.php index 104e766d..8eb58d64 100644 --- a/tests/Type/SmallMoneyTest.php +++ b/tests/Type/SmallMoneyTest.php @@ -182,7 +182,7 @@ public function testMaxValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow error converting expression to data type smallmoney.' + '[SQL Server]Arithmetic overflow error converting expression to data type smallmoney.' ); $command->insert('smallmoney', ['Mysmallmoney1' => '214749.3647'])->execute(); @@ -252,7 +252,7 @@ public function testMinValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow error converting expression to data type smallmoney.' + '[SQL Server]Arithmetic overflow error converting expression to data type smallmoney.' ); $command->insert('smallmoney', ['Mysmallmoney1' => '-214749.3648'])->execute(); diff --git a/tests/Type/TinyIntTest.php b/tests/Type/TinyIntTest.php index 9fc3bc78..94cb01e0 100644 --- a/tests/Type/TinyIntTest.php +++ b/tests/Type/TinyIntTest.php @@ -197,7 +197,7 @@ public function testMaxValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow' + '[SQL Server]Arithmetic overflow' ); $command->insert('tinyint', ['Mytinyint1' => 256])->execute(); @@ -267,7 +267,7 @@ public function testMinValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[22003]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Arithmetic overflow' + '[SQL Server]Arithmetic overflow' ); $command->insert('tinyint', ['Mytinyint1' => -1])->execute(); diff --git a/tests/Type/UniqueidentifierTest.php b/tests/Type/UniqueidentifierTest.php index 70a653de..30b1aebb 100644 --- a/tests/Type/UniqueidentifierTest.php +++ b/tests/Type/UniqueidentifierTest.php @@ -175,7 +175,7 @@ public function testValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - 'SQLSTATE[42000]: [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Conversion failed when converting from a character string to uniqueidentifier.' + '[SQL Server]Conversion failed when converting from a character string to uniqueidentifier.' ); $command = $db->createCommand(); diff --git a/tests/Type/VarCharTest.php b/tests/Type/VarCharTest.php index 40541718..ff81fec8 100644 --- a/tests/Type/VarCharTest.php +++ b/tests/Type/VarCharTest.php @@ -191,7 +191,7 @@ public function testValueException(): void $this->expectException(Exception::class); $this->expectExceptionMessage( - '[Microsoft][ODBC Driver 17 for SQL Server][SQL Server]String or binary data would be truncated' + '[SQL Server]String or binary data would be truncated' ); $command->insert('varchar', ['Myvarchar1' => '01234567891'])->execute();