Update test according to main PR

CHANGELOG.md

@@ -1,8 +1,8 @@
 # Oracle driver for Yii Database Change Log
 
-## 1.3.1 under development
+## 2.0.0 under development
 
-- no changes in this release.
+- Enh #255: Implement `SqlParser` and `ExpressionBuilder` driver classes (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 

rector.php

@@ -11,7 +11,10 @@
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
         __DIR__ . '/src',
-        __DIR__ . '/tests',
+        /**
+         * Disabled ./tests directory due to different branches with main package when testing
+         */
+        // __DIR__ . '/tests',
     ]);
 
     // register a single rule

src/Builder/ExpressionBuilder.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Oracle\Builder;
+
+use Yiisoft\Db\Expression\AbstractExpressionBuilder;
+use Yiisoft\Db\Oracle\SqlParser;
+
+final class ExpressionBuilder extends AbstractExpressionBuilder
+{
+    protected function createSqlParser(string $sql): SqlParser
+    {
+        return new SqlParser($sql);
+    }
+}

src/ColumnSchema.php

@@ -47,6 +47,7 @@ public function dbTypecast(mixed $value): mixed
             }
 
             if (is_string($value)) {
+                /** @var non-empty-string $placeholder */
                 $placeholder = uniqid('exp_' . preg_replace('/[^a-z0-9]/i', '', $this->getName()));
                 return new Expression('TO_BLOB(UTL_RAW.CAST_TO_RAW(:' . $placeholder . '))', [$placeholder => $value]);
             }

src/DQLQueryBuilder.php

@@ -4,7 +4,9 @@
 
 namespace Yiisoft\Db\Oracle;
 
+use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Expression\ExpressionInterface;
+use Yiisoft\Db\Oracle\Builder\ExpressionBuilder;
 use Yiisoft\Db\Oracle\Builder\InConditionBuilder;
 use Yiisoft\Db\Oracle\Builder\LikeConditionBuilder;
 use Yiisoft\Db\Query\Query;
@@ -87,6 +89,7 @@ protected function defaultExpressionBuilders(): array
             [
                 InCondition::class => InConditionBuilder::class,
                 LikeCondition::class => LikeConditionBuilder::class,
+                Expression::class => ExpressionBuilder::class,
             ],
         );
     }

src/SqlParser.php

@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Oracle;
+
+use Yiisoft\Db\Syntax\AbstractSqlParser;
+
+final class SqlParser extends AbstractSqlParser
+{
+    public function getNextPlaceholder(int|null &$position = null): string|null
+    {
+        $result = null;
+        $length = $this->length - 1;
+
+        while ($this->position < $length) {
+            $pos = $this->position++;
+
+            match ($this->sql[$pos]) {
+                ':' => ($word = $this->parseWord()) === ''
+                    ? $this->skipChars(':')
+                    : $result = ':' . $word,
+                '"' => $this->skipToAfterChar('"'),
+                "'" => $this->skipQuotedWithoutEscape($this->sql[$pos]),
+                'q', 'Q' => $this->sql[$this->position] === "'"
+                    ? $this->skipQuotedWithQ()
+                    : null,
+                '-' => $this->sql[$this->position] === '-'
+                    ? ++$this->position && $this->skipToAfterChar("\n")
+                    : null,
+                '/' => $this->sql[$this->position] === '*'
+                    ? ++$this->position && $this->skipToAfterString('*/')
+                    : null,
+                default => null,
+            };
+
+            if ($result !== null) {
+                $position = $pos;
+
+                return $result;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Skips quoted string with Q-operator.
+     */
+    private function skipQuotedWithQ(): void
+    {
+        $endChar = match ($this->sql[++$this->position]) {
+            '[' => ']',
+            '<' => '>',
+            '{' => '}',
+            '(' => ')',
+            default => $this->sql[$this->position],
+        };
+
+        ++$this->position;
+
+        $this->skipToAfterString("$endChar'");
+    }
+}

tests/CommandTest.php

@@ -527,9 +527,10 @@ public function testUpdate(
         array $columns,
         array|string $conditions,
         array $params,
-        string $expected
+        array $expectedValues,
+        int $expectedCount,
     ): void {
-        parent::testUpdate($table, $columns, $conditions, $params, $expected);
+        parent::testUpdate($table, $columns, $conditions, $params, $expectedValues, $expectedCount);
     }
 
     /**

tests/Provider/SqlParserProvider.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Oracle\Tests\Provider;
+
+class SqlParserProvider extends \Yiisoft\Db\Tests\Provider\SqlParserProvider
+{
+    public static function getNextPlaceholder(): array
+    {
+        return [
+            ...parent::getNextPlaceholder(),
+            [
+                "name = q'':name'' AND age = :age",
+                ':age',
+                28,
+            ],
+            [
+                "name = Q'':name'' AND age = :age",
+                ':age',
+                28,
+            ],
+            [
+                "name = Q'[:name]' AND age = :age",
+                ':age',
+                28,
+            ],
+            [
+                "name = Q'!':name'!' AND age = :age",
+                ':age',
+                30,
+            ],
+        ];
+    }
+}

tests/QueryBuilderTest.php

@@ -612,10 +612,11 @@ public function testUpdate(
         string $table,
         array $columns,
         array|string $condition,
-        string $expectedSQL,
-        array $expectedParams
+        array $params,
+        string $expectedSql,
+        array $expectedParams,
     ): void {
-        parent::testUpdate($table, $columns, $condition, $expectedSQL, $expectedParams);
+        parent::testUpdate($table, $columns, $condition, $params, $expectedSql, $expectedParams);
     }
 
     /**

tests/SqlParserTest.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Oracle\Tests;
+
+use Yiisoft\Db\Oracle\SqlParser;
+use Yiisoft\Db\Tests\AbstractSqlParserTest;
+
+/**
+ * @group oracle
+ */
+final class SqlParserTest extends AbstractSqlParserTest
+{
+    protected function createSqlParser(string $sql): SqlParser
+    {
+        return new SqlParser($sql);
+    }
+
+    /** @dataProvider \Yiisoft\Db\Oracle\Tests\Provider\SqlParserProvider::getNextPlaceholder */
+    public function testGetNextPlaceholder(string $sql, string|null $expectedPlaceholder, int|null $expectedPosition): void
+    {
+        parent::testGetNextPlaceholder($sql, $expectedPlaceholder, $expectedPosition);
+    }
+}