Simplify Oracle CI testing

doctrine · Jan 6, 2024 · abd5bfc · abd5bfc
1 parent 6a793fb
commit abd5bfc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 91 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -149,7 +149,7 @@ jobs:
           composer-options: "--ignore-platform-req=php+"
 
       - name: "Run PHPUnit"
-        run: "vendor/bin/phpunit -c ci/github/phpunit/oci8${{ matrix.oracle-version < 23 && '-21' || ''  }}.xml --coverage-clover=coverage.xml"
+        run: "vendor/bin/phpunit -c ci/github/phpunit/oci8.xml --coverage-clover=coverage.xml"
 
       - name: "Upload coverage file"
         uses: "actions/upload-artifact@v3"
@@ -208,7 +208,7 @@ jobs:
           composer-options: "--ignore-platform-req=php+"
 
       - name: "Run PHPUnit"
-        run: "vendor/bin/phpunit -c ci/github/phpunit/pdo_oci${{ matrix.oracle-version < 23 && '-21' || ''  }}.xml --coverage-clover=coverage.xml"
+        run: "vendor/bin/phpunit -c ci/github/phpunit/pdo_oci.xml --coverage-clover=coverage.xml"
 
       - name: "Upload coverage file"
         uses: "actions/upload-artifact@v3"

diff --git a/ci/github/phpunit/oci8-21.xml b/ci/github/phpunit/oci8-21.xml
diff --git a/ci/github/phpunit/pdo_oci-21.xml b/ci/github/phpunit/pdo_oci-21.xml
diff --git a/src/Driver/AbstractOracleDriver/EasyConnectString.php b/src/Driver/AbstractOracleDriver/EasyConnectString.php
@@ -55,15 +55,7 @@ public static function fromConnectionParameters(array $params): self
         $connectData = [];
 
         if (isset($params['servicename']) || isset($params['dbname'])) {
-            $serviceKey = 'SID';
-
-            if (isset($params['service'])) {
-                $serviceKey = 'SERVICE_NAME';
-            }
-
-            $serviceName = $params['servicename'] ?? $params['dbname'];
-
-            $connectData[$serviceKey] = $serviceName;
+            $connectData['SERVICE_NAME'] = $params['servicename'] ?? $params['dbname'];
         }
 
         if (isset($params['instancename'])) {

diff --git a/tests/Driver/AbstractOracleDriver/EasyConnectStringTest.php b/tests/Driver/AbstractOracleDriver/EasyConnectStringTest.php
@@ -30,7 +30,8 @@ public static function connectionParametersProvider(): iterable
                     'port' => 1521,
                     'dbname' => 'XE',
                 ],
-                '(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=oracle.example.com)(PORT=1521))(CONNECT_DATA=(SID=XE)))',
+                '(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=oracle.example.com)(PORT=1521))'
+                    . '(CONNECT_DATA=(SERVICE_NAME=XE)))',
             ],
             'no-db-name' => [
                 ['host' => 'localhost'],
@@ -55,7 +56,7 @@ public static function connectionParametersProvider(): iterable
                     'pooled' => true,
                 ],
                 '(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=41521))'
-                    . '(CONNECT_DATA=(SID=XE)(INSTANCE_NAME=SALES)(SERVER=POOLED)))',
+                    . '(CONNECT_DATA=(SERVICE_NAME=XE)(INSTANCE_NAME=SALES)(SERVER=POOLED)))',
             ],
         ];
     }