Merge branch 'master' into allow_scalars

CHANGELOG.md

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

src/Builder/ExpressionBuilder.php

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

src/DQLQueryBuilder.php

@@ -6,7 +6,9 @@
 
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidArgumentException;
+use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Expression\ExpressionInterface;
+use Yiisoft\Db\Mssql\Builder\ExpressionBuilder;
 use Yiisoft\Db\Mssql\Builder\InConditionBuilder;
 use Yiisoft\Db\Mssql\Builder\LikeConditionBuilder;
 use Yiisoft\Db\Query\Query;
@@ -48,6 +50,7 @@ protected function defaultExpressionBuilders(): array
         return array_merge(parent::defaultExpressionBuilders(), [
             InCondition::class => InConditionBuilder::class,
             LikeCondition::class => LikeConditionBuilder::class,
+            Expression::class => ExpressionBuilder::class,
         ]);
     }
 

src/SqlParser.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Mssql;
+
+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->skipQuotedWithoutEscape($this->sql[$pos]),
+                '[' => $this->sql[$this->position] === '['
+                    ? $this->skipToAfterString(']]')
+                    : $this->skipQuotedWithoutEscape(']'),
+                '-' => $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;
+    }
+}

tests/CommandTest.php

@@ -241,9 +241,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,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Mssql\Tests\Provider;
+
+class SqlParserProvider extends \Yiisoft\Db\Tests\Provider\SqlParserProvider
+{
+    public static function getNextPlaceholder(): array
+    {
+        return [
+            ...parent::getNextPlaceholder(),
+            [
+                '[:field] = :name AND age = :age',
+                ':name',
+                11,
+            ],
+            [
+                '[[:field]] = :name AND age = :age',
+                ':name',
+                13,
+            ],
+        ];
+    }
+}

tests/QueryBuilderTest.php

@@ -523,6 +523,18 @@ public function testSelectExists(string $sql, string $expected): void
         parent::testSelectExists($sql, $expected);
     }
 
+    /** @dataProvider \Yiisoft\Db\Mssql\Tests\Provider\QueryBuilderProvider::update */
+    public function testUpdate(
+        string $table,
+        array $columns,
+        array|string $condition,
+        array $params,
+        string $expectedSql,
+        array $expectedParams,
+    ): void {
+        parent::testUpdate($table, $columns, $condition, $params, $expectedSql, $expectedParams);
+    }
+
     /**
      * @dataProvider \Yiisoft\Db\Mssql\Tests\Provider\QueryBuilderProvider::upsert
      *

tests/SqlParserTest.php

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