improve

Author: vjik

tests/ColumnTest.php

@@ -16,6 +16,7 @@
 use Yiisoft\Db\Oracle\Column\JsonColumn;
 use Yiisoft\Db\Oracle\Tests\Provider\ColumnProvider;
 use Yiisoft\Db\Oracle\Tests\Support\IntegrationTestTrait;
+use Yiisoft\Db\Oracle\Tests\Support\TestConnection;
 use Yiisoft\Db\Query\Query;
 use Yiisoft\Db\Schema\Column\ColumnInterface;
 use Yiisoft\Db\Schema\Column\DoubleColumn;
@@ -38,8 +39,7 @@ final class ColumnTest extends CommonColumnTest
     public function testQueryWithTypecasting(): void
     {
         $db = $this->getSharedConnection();
-        $version = $db->getServerInfo()->getVersion();
-        $isOldVersion = version_compare($version, '21', '<');
+        $isOldVersion = version_compare(TestConnection::getServerVersion(), '21', '<');
 
         $this->loadFixture(
             __DIR__ . '/Support/Fixture/'
@@ -64,8 +64,7 @@ public function testQueryWithTypecasting(): void
     public function testCommandWithPhpTypecasting(): void
     {
         $db = $this->getSharedConnection();
-        $version = $db->getServerInfo()->getVersion();
-        $isOldVersion = version_compare($version, '21', '<');
+        $isOldVersion = version_compare(TestConnection::getServerVersion(), '21', '<');
 
         $this->loadFixture(
             __DIR__ . '/Support/Fixture/'
@@ -136,8 +135,7 @@ public function testSelectWithPhpTypecasting(): void
     public function testPhpTypecast(): void
     {
         $db = $this->getSharedConnection();
-        $version = $db->getServerInfo()->getVersion();
-        $isOldVersion = version_compare($version, '21', '<');
+        $isOldVersion = version_compare(TestConnection::getServerVersion(), '21', '<');
 
         $this->loadFixture(
             __DIR__ . '/Support/Fixture/'
@@ -150,8 +148,7 @@ public function testPhpTypecast(): void
     public function testColumnInstance(): void
     {
         $db = $this->getSharedConnection();
-        $version = $db->getServerInfo()->getVersion();
-        $isOldVersion = version_compare($version, '21', '<');
+        $isOldVersion = version_compare(TestConnection::getServerVersion(), '21', '<');
 
         $this->loadFixture(
             __DIR__ . '/Support/Fixture/'

tests/CommandTest.php

@@ -610,7 +610,7 @@ public function testCreateSearchIndex()
     {
         $db = $this->getSharedConnection();
 
-        if (version_compare($db->getServerInfo()->getVersion(), '21', '<')) {
+        if (version_compare(TestConnection::getServerVersion(), '21', '<')) {
             $this->markTestSkipped('Search index is supported since Oracle 21');
         }
 

tests/Provider/QueryBuilderProvider.php

@@ -379,7 +379,7 @@ public static function buildColumnDefinition(): array
         $values['reference($reference)'][0] = 'number(10) REFERENCES "ref_table" ("id") ON DELETE SET NULL';
         $values['reference($referenceWithSchema)'][0] = 'number(10) REFERENCES "ref_schema"."ref_table" ("id") ON DELETE SET NULL';
 
-        $version = TestConnection::getShared()->getServerInfo()->getVersion();
+        $version = TestConnection::getServerVersion();
         if (version_compare($version, '21', '>=')) {
             $values['array()'][0] = 'json';
             $values['structured()'][0] = 'json';

tests/SchemaTest.php

@@ -14,6 +14,7 @@
 use Yiisoft\Db\Oracle\Schema;
 use Yiisoft\Db\Oracle\Tests\Provider\SchemaProvider;
 use Yiisoft\Db\Oracle\Tests\Support\IntegrationTestTrait;
+use Yiisoft\Db\Oracle\Tests\Support\TestConnection;
 use Yiisoft\Db\Schema\Column\ColumnInterface;
 use Yiisoft\Db\Tests\Common\CommonSchemaTest;
 use Yiisoft\Db\Tests\Support\TestHelper;
@@ -31,7 +32,7 @@ final class SchemaTest extends CommonSchemaTest
     public function testColumns(array $columns, string $tableName = 'type', ?string $dump = null): void
     {
         $db = $this->getSharedConnection();
-        $version21 = version_compare($db->getServerInfo()->getVersion(), '21', '>=');
+        $version21 = version_compare(TestConnection::getServerVersion(), '21', '>=');
 
         if ($version21 && $tableName === 'type') {
             $dump = __DIR__ . '/Support/Fixture/oci21.sql';
@@ -93,7 +94,7 @@ public function testGetSchemaNames(): void
 
         $schema = $db->getSchema();
 
-        if (version_compare($db->getServerInfo()->getVersion(), '12', '>')) {
+        if (version_compare(TestConnection::getServerVersion(), '12', '>')) {
             $this->assertContains('SYSBACKUP', $schema->getSchemaNames());
         } else {
             $this->assertEmpty($schema->getSchemaNames());

tests/Support/TestConnection.php

@@ -21,6 +21,11 @@ public static function getShared(): Connection
         return $db;
     }
 
+    public static function getServerVersion(): string
+    {
+        return self::getShared()->getServerInfo()->getVersion();
+    }
+
     public static function dsn(): string
     {
         return self::$dsn ??= (string) new Dsn(