Support for Doctrine DBAL 3

.gitignore

@@ -3,6 +3,7 @@
 .project
 .vagrant
 .phpunit.result.cache
+*.cache
 *-console.log
 .crate-docs
 /composer.lock

.php-cs-fixer.php

@@ -0,0 +1,26 @@
+<?php
+// PHP Coding Standards Fixer
+// https://cs.symfony.com/
+// https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/config.rst
+
+$finder = (new PhpCsFixer\Finder())
+    ->in(__DIR__)
+;
+
+return (new PhpCsFixer\Config())
+    ->setUnsupportedPhpVersionAllowed(true)
+    ->setRules([
+        // '@auto' => true,
+        // '@PHP7x3Migration' => true,
+        // '@PSR1' => true,
+        // '@PSR2' => true,
+        // '@PSR12' => true,
+        // '@Symfony' => true,
+        // 'array_syntax' => ['syntax' => 'short'],
+        'ordered_imports' => true,
+        // 'strict_param' => true,
+    ])
+    ->setFinder($finder)
+    ;
+
+?>

CHANGES.txt

@@ -5,6 +5,8 @@ CHANGES for crate-dbal
 Unreleased
 ==========
 
+- Added support for Doctrine 3, dropped support for Doctrine 2.
+
 2025/11/13 4.0.3
 ================
 

composer.json

@@ -16,7 +16,7 @@
     "prefer-stable": true,
     "require": {
         "php": "^8.0|^8.1|^8.2|^8.3|^8.4|^8.5",
-        "doctrine/dbal": "^2",
+        "doctrine/dbal": "^3",
         "crate/crate-pdo": "^2",
         "ext-pdo": "*"
     },
@@ -27,12 +27,14 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0",
-        "squizlabs/php_codesniffer": "^3.5"
+        "friendsofphp/php-cs-fixer": "^3.89"
     },
     "autoload-dev": {
         "psr-0": {
-            "Crate\\Test": "test",
-            "Doctrine\\Tests": "vendor/doctrine/dbal/tests"
+            "Crate\\Test": "test"
+        },
+        "psr-4": {
+            "Doctrine\\DBAL\\Tests\\": "vendor/doctrine/dbal/tests"
         }
     },
     "config": {
@@ -42,7 +44,7 @@
     },
     "scripts": {
         "test": "XDEBUG_MODE=coverage phpunit --coverage-clover build/logs/clover.xml",
-        "check-style": "phpcs",
-        "fix-style": "phpcbf"
+        "check-style": "php-cs-fixer check",
+        "fix-style": "php-cs-fixer fix"
     }
 }

docs/appendices/data-types.rst

@@ -89,8 +89,8 @@ Here's an example of how the ``MapType`` can be used:
     $objDefinition = array(
       'type' => MapType::STRICT,
        'fields' => array(
-         new Column('id',  Type::getType('integer'), array()),
-         new Column('name',  Type::getType('string'), array()),
+         new Column('id', Type::getType('integer'), array()),
+         new Column('name', Type::getType('string'), array()),
          ),
        );
     $table->addColumn(

docs/appendices/table-options.rst

@@ -18,7 +18,7 @@ Example:
 
    $options = [];
    $options['sharding_shards'] = 5;
-   $myTable = new Table('my_table', [], [], [], 0, $options);
+   $myTable = new Table('my_table', [], [], [], [], $options);
 
 
 Sharding Options
@@ -66,7 +66,7 @@ Example on how to adjust the replicas:
    $options = [];
    $options['table_options'] = [];
    $options['table_options']['number_of_replicas'] = '2';
-   $myTable = new Table('my_table', [], [], [], 0, $options);
+   $myTable = new Table('my_table', [], [], [], [], $options);
 
 
 .. _CrateDB CREATE TABLE Documentation: https://cratedb.com/docs/crate/reference/en/latest/sql/statements/create-table.html

docs/connect.rst

@@ -29,14 +29,16 @@ If you plan to query CrateDB via DBAL, you can get a connection from the
 
 .. code-block:: php
 
+    use Doctrine\DBAL\DriverManager;
+
     $params = array(
         'driverClass' => 'Crate\DBAL\Driver\PDOCrate\Driver',
         'user' => 'crate',
         'host' => 'localhost',
         'port' => 4200
     );
-    $connection = \Doctrine\DBAL\DriverManager::getConnection($params);
-    $schemaManager = $connection->getSchemaManager();
+    $connection = DriverManager::getConnection($params);
+    $schemaManager = $connection->createSchemaManager();
 
 With these connection parameters, the ``DriverManager`` will attempt to
 authenticate as ``crate`` with a CrateDB node listening on ``localhost:4200``.

examples/objects.php

@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * Basic example program about handling CrateDB OBJECTs with Doctrine DBAL.
+ * https://github.com/crate/crate-dbal
+ */
+require __DIR__ . '/../vendor/autoload.php';
+
+use Crate\DBAL\Platforms\CratePlatform4;
+use Crate\DBAL\Types\MapType;
+use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Exception\TableNotFoundException;
+use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\Table;
+
+use Doctrine\DBAL\Tools\DsnParser;
+use Doctrine\DBAL\Types\Type;
+
+// Initialize machinery.
+// This ensures that the 'map' type is registered in the type system from the beginning.
+$platform = new CratePlatform4();
+
+// Define table schema.
+$table = new Table('example');
+$objDefinition = array(
+    'type' => MapType::STRICT,
+    'fields' => array(
+        new Column('id', Type::getType('integer'), array()),
+        new Column('name', Type::getType('string'), array()),
+    ),
+);
+$table->addColumn(
+    'data',
+    MapType::NAME,
+    array('platformOptions' => $objDefinition),
+);
+
+// Register driver.
+$dsnParser = new DsnParser(array('crate' => 'Crate\DBAL\Driver\PDOCrate\Driver'));
+
+// Connect to database.
+$connectionParams = $dsnParser->parse('crate://crate:crate@localhost:4200/');
+$connection = DriverManager::getConnection($connectionParams);
+$schemaManager = $connection->createSchemaManager();
+
+// Provision database table.
+try {
+    $schemaManager->dropTable($table->getName());
+} catch (TableNotFoundException) {
+}
+$schemaManager->createTable($table);
+
+// Insert data.
+$connection->insert('example', array('data' => array('id' => 42, 'name' => 'foo')), array('data' => 'map'));
+$connection->insert('example', array('data' => array('id' => 43, 'name' => 'bar')), array('data' => 'map'));
+$connection->executeStatement('REFRESH TABLE example');
+
+// Query data.
+$result = $connection->executeQuery('SELECT * FROM example');
+print_r($result->fetchAllAssociative());
+
+?>

src/Crate/DBAL/Driver/PDOCrate/CrateStatement.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Licensed to CRATE Technology GmbH("Crate") under one or more contributor
  * license agreements.  See the NOTICE file distributed with this work for
@@ -22,14 +23,127 @@
 
 namespace Crate\DBAL\Driver\PDOCrate;
 
+use Crate\PDO\PDOInterface;
+use Crate\PDO\PDOStatement;
+use Doctrine\DBAL\Driver\PDO\Exception;
 use Doctrine\DBAL\Driver\PDOStatementImplementations;
+use Doctrine\DBAL\Driver\Result as ResultInterface;
 use Doctrine\DBAL\Driver\Statement as StatementInterface;
-use Crate\PDO\PDOStatement;
+use Doctrine\DBAL\ParameterType;
+use Doctrine\Deprecations\Deprecation;
+use PDO;
 
 /**
  * @internal
  */
-class CrateStatement extends PDOStatement implements StatementInterface
+final class CrateStatement implements StatementInterface
 {
-    use PDOStatementImplementations;
+    private PDOInterface $pdo;
+    private PDOStatement $stmt;
+
+    /**
+     * @param string              $sql
+     * @param array<string,mixed> $options
+     */
+    public function __construct(PDOInterface $pdo, $sql, $options = [])
+    {
+        $this->pdo  = $pdo;
+        $this->stmt = $pdo->prepare($sql, $options);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function execute($params = null): ResultInterface
+    {
+
+        if ($params !== null) {
+            Deprecation::trigger(
+                'doctrine/dbal',
+                'https://github.com/doctrine/dbal/pull/5556',
+                'Passing $params to Statement::execute() is deprecated. Bind parameters using'
+                . ' Statement::bindParam() or Statement::bindValue() instead.',
+            );
+        }
+        $this->stmt->execute($params);
+        return new Result($this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function columnCount(): int
+    {
+        return $this->stmt->columnCount();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function rowCount(): int
+    {
+        return $this->stmt->rowCount();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function bindValue($param, $value, $type = ParameterType::STRING)
+    {
+        return $this->stmt->bindValue($param, $value, $type);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function bindParam($param, &$variable, $type = ParameterType::STRING, $length = null)
+    {
+        return $this->stmt->bindParam($param, $variable, $type, $length);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function fetch(
+        $fetch_style = PDO::FETCH_ASSOC,
+        $cursor_orientation = PDO::FETCH_ORI_NEXT,
+        $cursor_offset = 0,
+    ) {
+        return $this->stmt->fetch($fetch_style, $cursor_orientation, $cursor_offset);
+    }
+
+    /**
+     * @phpstan-param PDO::FETCH_* $mode
+     *
+     * @return list<mixed>
+     *
+     * @throws Exception
+     */
+    public function fetchAll(int $mode): array
+    {
+        return $this->stmt->fetchAll($mode);
+    }
+
+    public function fetchColumn($column_number = 0)
+    {
+        return $this->stmt->fetchColumn($column_number);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function closeCursor(): bool
+    {
+        return $this->stmt->closeCursor();
+    }
+
+    /**
+     * Gets the wrapped CrateDB PDOStatement.
+     *
+     * @return PDOStatement
+     */
+    public function getWrappedStatement(): PDOStatement
+    {
+        return $this->stmt;
+    }
 }