Merge pull request #87 from php-db/refactor-sql-abstraction

Refactor sql abstraction

Author: simon-mundy

.gitignore

@@ -2,6 +2,7 @@
 /.phpunit.result.cache
 /.phpstan-cache
 /phpstan.neon
+/phpbench.json
 /clover.xml
 /coveralls-upload.json
 /phpunit.xml

.gitignore copy

@@ -1,8 +1,7 @@
 {
     "extensions": [
         "pdo-sqlite",
-        "sqlite3",
-        "sqlsrv"
+        "sqlite3"
     ],
     "additional_checks": [
         {
@@ -14,4 +13,4 @@
             }
         }
     ]
-}
+}

.laminas-ci.json

@@ -4,28 +4,33 @@
     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="vendor/autoload.php"
     colors="true">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <exclude>
-            <file>./src/Sql/Ddl/Column/Float.php</file>
-        </exclude>
-    </coverage>
+
+    <extensions>
+        <bootstrap class="PhpDbIntegrationTest\Extension\ListenerExtension" />
+    </extensions>
 
     <testsuites>
         <testsuite name="unit test">
             <directory>./test/unit</directory>
+            <exclude>./test/unit/Adapter/AdapterAbstractServiceFactoryTest.php</exclude>
+            <exclude>./test/unit/Adapter/AdapterServiceFactoryTest.php</exclude>
+            <exclude>./test/unit/Adapter/AdapterServiceDelegatorTest.php</exclude>
+            <exclude>./test/unit/Adapter/Driver/Pdo/PdoTest.php</exclude>
+            <exclude>./test/unit/Adapter/Driver/Pdo/ConnectionTest.php</exclude>
+            <exclude>./test/unit/Adapter/Driver/Pdo/ConnectionIntegrationTest.php</exclude>
+            <exclude>./test/unit/Adapter/Driver/Pdo/StatementTest.php</exclude>
+            <exclude>./test/unit/Adapter/Driver/Pdo/StatementIntegrationTest.php</exclude>
+            <exclude>./test/unit/Adapter/AdapterTest.php</exclude>
+            <exclude>./test/unit/Adapter/AdapterAwareTraitTest.php</exclude>
+            <exclude>./test/unit/TableGateway</exclude>
+            <exclude>./test/unit/RowGateway</exclude>
+            <exclude>./test/unit/ConfigProviderTest.php</exclude>
         </testsuite>
         <testsuite name="integration test">
             <directory>./test/integration</directory>
         </testsuite>
     </testsuites>
 
-    <listeners>
-        <listener class="PhpDbIntegrationTest\IntegrationTestListener" file="./test/integration/IntegrationTestListener.php"/>
-    </listeners>
-
     <php>
         <!-- Integration Test Variables -->
         <env name="TESTS_PHPDB_ADAPTER_DRIVER_MYSQL" value="true" />
@@ -34,7 +39,7 @@
         <env name="TESTS_PHPDB_ADAPTER_DRIVER_MYSQL_PASSWORD" value="password" />
         <env name="TESTS_PHPDB_ADAPTER_DRIVER_MYSQL_DATABASE" value="laminasdb_test" />
 
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV" value="true" />
+        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV" value="false" />
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV_HOSTNAME" value="mssql" />
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV_USERNAME" value="sa" />
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV_PASSWORD" value="Password123" />
@@ -52,7 +57,7 @@
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_IBMDB2_PASSWORD" value="" />
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_IBMDB2_DATABASE" value="" />
 
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL" value="true" />
+        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL" value="false" />
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL_HOSTNAME" value="postgres" />
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL_USERNAME" value="gha" />
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL_PASSWORD" value="password" />

.laminas-ci/phpunit.xml

@@ -22,8 +22,8 @@ The `phpunit.xml.dist` file defines two test suites, "unit test" and "integratio
 You can run one or the other using the `--testsuite` option to `phpunit`:
 
 ```bash
-$ ./vendor/bin/phpunit --testsuite "unit test" # unit tests only
-$ ./vendor/bin/phpunit --testsuite "integration test" # integration tests only
+./vendor/bin/phpunit --testsuite "unit test" # unit tests only
+./vendor/bin/phpunit --testsuite "integration test" # integration tests only
 ```
 
 Unit tests do not require additional functionality beyond having the appropriate database extensions present and loaded in your PHP binary.
@@ -36,13 +36,13 @@ So, the repository includes a [Docker Compose][docker-compose] configuration whi
 To start up the configuration, run the following command:
 
 ```bash
-$ docker compose up -d
+docker compose up -d
 ```
 
 To test that the environment is up and running, run the following command:
 
 ```bash
-$ docker compose ps
+docker compose ps
 ```
 
 You should see output similar to the following:
@@ -65,16 +65,16 @@ So, copy `phpunit.xml.dist` to `phpunit.xml`, and change the following environme
 From there, you can run the integration tests by running the following command:
 
 ```bash
-$ docker compose exec php composer test-integration
+docker compose exec php composer test-integration
 ```
 
 > [!TIP]
 > If you want to grow your Docker Compose knowledge, grab a (free) copy of [Deploy with Docker Compose][deploy-with-docker-compose].
 
 -----
 
-- File issues at https://github.com/php-db/phpdb/issues
-- Documentation is at https://docs.php-db.dev
+- File issues at <https://github.com/php-db/phpdb/issues>
+- Documentation is at <https://docs.php-db.dev>
 
 [docker-compose]: https://docs.docker.com/compose/intro/features-uses/
-[deploy-with-docker-compose]: https://deploywithdockercompose.com
+[deploy-with-docker-compose]: https://deploywithdockercompose.com

README.md

@@ -37,6 +37,7 @@
         "laminas/laminas-coding-standard": "^3.0.1",
         "laminas/laminas-eventmanager": "^3.14.0",
         "laminas/laminas-hydrator": "^4.6.0",
+        "phpbench/phpbench": "^1.4",
         "phpstan/phpstan": "^2.1",
         "phpstan/phpstan-phpunit": "^2.0",
         "phpunit/phpunit": "^11.5.15",
@@ -55,7 +56,8 @@
     "autoload-dev": {
         "psr-4": {
             "PhpDbTest\\": "test/unit/",
-            "PhpDbIntegrationTest\\": "test/integration/"
+            "PhpDbIntegrationTest\\": "test/integration/",
+            "PhpDbBenchmark\\": "test/benchmark/"
         }
     },
     "scripts": {