Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tigrov
Tigrov committed Oct 11, 2024
1 parent db7fb48 commit fcca0b6
Show file tree
Hide file tree
Showing 16 changed files with 47 additions and 40 deletions.
35 changes: 22 additions & 13 deletions src/Dsn.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
final class Dsn extends AbstractDsn
{
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 $port = '1433',
array $options = []
) {
parent::__construct($driver, $host, $databaseName, $port);
parent::__construct($driver, $host, $databaseName, $port, $options);

Check failure on line 23 in src/Dsn.php

View workflow job for this annotation

GitHub Actions / PHP 8.1

MixedArgumentTypeCoercion 

src/Dsn.php:23:67: MixedArgumentTypeCoercion: Argument 5 of Yiisoft\Db\Connection\AbstractDsn::__construct expects array<array-key, string>, but parent type array<array-key, mixed> provided (see https://psalm.dev/194)

Check failure on line 23 in src/Dsn.php

View workflow job for this annotation

GitHub Actions / PHP 8.2

MixedArgumentTypeCoercion 

src/Dsn.php:23:67: MixedArgumentTypeCoercion: Argument 5 of Yiisoft\Db\Connection\AbstractDsn::__construct expects array<array-key, string>, but parent type array<array-key, mixed> provided (see https://psalm.dev/194)

Check failure on line 23 in src/Dsn.php

View workflow job for this annotation

GitHub Actions / PHP 8.3

MixedArgumentTypeCoercion 

src/Dsn.php:23:67: MixedArgumentTypeCoercion: Argument 5 of Yiisoft\Db\Connection\AbstractDsn::__construct expects array<array-key, string>, but parent type array<array-key, mixed> provided (see https://psalm.dev/194)
}

/**
Expand All @@ -39,16 +40,24 @@ 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)) {
$dsn .= ';' . http_build_query($options, '', ';');
}

return $dsn;
Expand Down
4 changes: 2 additions & 2 deletions tests/CommandTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,15 +313,15 @@ 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(),
);

$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());
}

Expand Down
6 changes: 2 additions & 4 deletions tests/Support/TestTrait.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ protected function getConnection(bool $fixture = false): PdoConnectionInterface

protected static function getDb(): PdoConnectionInterface
{
$dsn = (new Dsn('sqlsrv', 'localhost', 'yiitest'))->asString();
$dsn .= ';Encrypt=no';
$dsn = (new Dsn(databaseName: 'yiitest', options: ['Encrypt' => 'no']))->asString();

return new Connection(
new Driver($dsn, 'SA', 'YourStrong!Passw0rd'),
Expand All @@ -49,8 +48,7 @@ protected static function getDb(): PdoConnectionInterface
protected function getDsn(): string
{
if ($this->dsn === '') {
$this->dsn = (new Dsn('sqlsrv', 'localhost', 'yiitest'))->asString();
$this->dsn .= ';Encrypt=no';
$this->dsn = (new Dsn(databaseName: 'yiitest', options: ['Encrypt' => 'no']))->asString();
}

return $this->dsn;
Expand Down
2 changes: 1 addition & 1 deletion tests/Type/CharTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
'[ODBC Driver 18 for SQL Server][SQL Server]String or binary data would be truncated'
);

$command->insert('char', ['Mychar1' => '01234567891'])->execute();
Expand Down
2 changes: 1 addition & 1 deletion tests/Type/DateTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
'SQLSTATE[22007]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Conversion failed when converting date and/or time from character string.'
);

$db->createCommand()->insert('date', ['Mydate1' => '0000-00-00'])->execute();
Expand Down
4 changes: 2 additions & 2 deletions tests/Type/DecimalTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)."
"SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]The number '199999999999999997748809823456034029570' is out of the range for numeric representation (maximum precision 38)."
);

$command->insert(
Expand Down Expand Up @@ -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)."
"SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]The number '199999999999999997748809823456034029570' is out of the range for numeric representation (maximum precision 38)."
);

$command->insert(
Expand Down
4 changes: 2 additions & 2 deletions tests/Type/FloatTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)."
"SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][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();
Expand Down Expand Up @@ -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)."
"SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][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();
Expand Down
4 changes: 2 additions & 2 deletions tests/Type/IntTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow'
);

$command->insert('int', ['Myint1' => 2_147_483_648])->execute();
Expand Down Expand Up @@ -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'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow'
);

$command->insert('int', ['Myint1' => -2_147_483_649])->execute();
Expand Down
4 changes: 2 additions & 2 deletions tests/Type/MoneyTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow error converting expression to data type money.'
);

$command->insert('money', ['Mymoney1' => '922337203685478.5808'])->execute();
Expand Down Expand Up @@ -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.'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow error converting expression to data type money.'
);

$command->insert('money', ['Mymoney1' => '-922337203685480.5808'])->execute();
Expand Down
2 changes: 1 addition & 1 deletion tests/Type/NumericTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)."
"SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]The number '199999999999999997748809823456034029570' is out of the range for numeric representation (maximum precision 38)."
);

$command->insert(
Expand Down
4 changes: 2 additions & 2 deletions tests/Type/RealTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow error for type real'
);

$command->insert('real', ['Myreal1' => new Expression('4.4E+38')])->execute();
Expand Down Expand Up @@ -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'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow error for type real'
);

$command->insert('real', ['Myreal1' => new Expression('-4.4E+38')])->execute();
Expand Down
4 changes: 2 additions & 2 deletions tests/Type/SmallIntTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow'
);

$command->insert('smallint', ['Mysmallint1' => 32768])->execute();
Expand Down Expand Up @@ -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'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow'
);

$command->insert('smallint', ['Mysmallint1' => -32769])->execute();
Expand Down
4 changes: 2 additions & 2 deletions tests/Type/SmallMoneyTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow error converting expression to data type smallmoney.'
);

$command->insert('smallmoney', ['Mysmallmoney1' => '214749.3647'])->execute();
Expand Down Expand Up @@ -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.'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow error converting expression to data type smallmoney.'
);

$command->insert('smallmoney', ['Mysmallmoney1' => '-214749.3648'])->execute();
Expand Down
4 changes: 2 additions & 2 deletions tests/Type/TinyIntTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow'
);

$command->insert('tinyint', ['Mytinyint1' => 256])->execute();
Expand Down Expand Up @@ -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'
'SQLSTATE[22003]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Arithmetic overflow'
);

$command->insert('tinyint', ['Mytinyint1' => -1])->execute();
Expand Down
2 changes: 1 addition & 1 deletion tests/Type/UniqueidentifierTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
'SQLSTATE[42000]: [Microsoft][ODBC Driver 18 for SQL Server][SQL Server]Conversion failed when converting from a character string to uniqueidentifier.'
);

$command = $db->createCommand();
Expand Down
2 changes: 1 addition & 1 deletion tests/Type/VarCharTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
'[Microsoft][ODBC Driver 18 for SQL Server][SQL Server]String or binary data would be truncated'
);

$command->insert('varchar', ['Myvarchar1' => '01234567891'])->execute();
Expand Down

0 comments on commit fcca0b6

Please sign in to comment.