Merge branch 'master' into allow_scalars

CHANGELOG.md

@@ -1,8 +1,10 @@
 # MySQL driver for Yii Database Change Log
 
-## 1.2.1 under development
+## 2.0.0 under development
 
-- no changes in this release.
+- Enh #320: Minor refactoring of `DDLQueryBuilder::getColumnDefinition()` method (@Tigrov)
+- Bug #320: Change visibility of `DDLQueryBuilder::getColumnDefinition()` method to `private` (@Tigrov)
+- Enh #321: 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\Mysql\Builder;
+
+use Yiisoft\Db\Expression\AbstractExpressionBuilder;
+use Yiisoft\Db\Mysql\SqlParser;
+
+final class ExpressionBuilder extends AbstractExpressionBuilder
+{
+    protected function createSqlParser(string $sql): SqlParser
+    {
+        return new SqlParser($sql);
+    }
+}

src/DDLQueryBuilder.php

@@ -10,6 +10,7 @@
 use Yiisoft\Db\QueryBuilder\AbstractDDLQueryBuilder;
 
 use function preg_match;
+use function preg_quote;
 use function preg_replace;
 use function trim;
 
@@ -167,27 +168,23 @@ public function renameColumn(string $table, string $oldName, string $newName): s
      * @param string $table The table name.
      * @param string $column The column name.
      *
-     * @throws Throwable In case when table doesn't contain a column.
-     *
-     * @return string The column definition.
+     * @return string The column definition or empty string in case when schema does not contain the table
+     * or the table doesn't contain the column.
      */
-    public function getColumnDefinition(string $table, string $column): string
+    private function getColumnDefinition(string $table, string $column): string
     {
-        $result = '';
         $sql = $this->schema->getTableSchema($table)?->getCreateSql();
 
         if (empty($sql)) {
             return '';
         }
 
-        if (preg_match_all('/^\s*([`"])(.*?)\\1\s+(.*?),?$/m', $sql, $matches) > 0) {
-            foreach ($matches[2] as $i => $c) {
-                if ($c === $column) {
-                    $result = $matches[3][$i];
-                }
-            }
+        $quotedColumn = preg_quote($column, '/');
+
+        if (preg_match("/^\s*([`\"])$quotedColumn\\1\s+(.*?),?$/m", $sql, $matches) !== 1) {
+            return '';
         }
 
-        return $result;
+        return $matches[2];
     }
 }

src/DQLQueryBuilder.php

@@ -4,9 +4,10 @@
 
 namespace Yiisoft\Db\Mysql;
 
-use Yiisoft\Db\Expression\ExpressionBuilder;
+use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Expression\JsonExpression;
+use Yiisoft\Db\Mysql\Builder\ExpressionBuilder;
 use Yiisoft\Db\Mysql\Builder\JsonExpressionBuilder;
 use Yiisoft\Db\QueryBuilder\AbstractDQLQueryBuilder;
 
@@ -83,6 +84,7 @@ protected function defaultExpressionBuilders(): array
             parent::defaultExpressionBuilders(),
             [
                 JsonExpression::class => JsonExpressionBuilder::class,
+                Expression::class => ExpressionBuilder::class,
             ]
         );
     }

src/SqlParser.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Mysql;
+
+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->skipQuotedWithEscape($this->sql[$pos]),
+                '-' => $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

@@ -120,9 +120,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\Mysql\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,
+            ],
+            [
+                '`:fie\\`ld` = :name AND age = :age',
+                ':name',
+                13,
+            ],
+            [
+                '":fie\\"ld" = :name AND age = :age',
+                ':name',
+                13,
+            ],
+            [
+                "name = ':na\\'me' AND age = :age",
+                ':age',
+                27,
+            ],
+        ];
+    }
+}

tests/QueryBuilderTest.php

@@ -516,7 +516,6 @@ public function testInsertInteger()
     public function testRenameColumn(): void
     {
         $db = $this->getConnection();
-
         $qb = $db->getQueryBuilder();
 
         $this->assertSame(
@@ -525,6 +524,20 @@ public function testRenameColumn(): void
             SQL,
             $qb->renameColumn('alpha', 'string_identifier', 'string_identifier_test'),
         );
+
+        $this->assertSame(
+            <<<SQL
+            ALTER TABLE `alpha` CHANGE `non_exist_column` `new_column`
+            SQL,
+            $qb->renameColumn('alpha', 'non_exist_column', 'new_column'),
+        );
+
+        $this->assertSame(
+            <<<SQL
+            ALTER TABLE `non_exist_table` CHANGE `non_exist_column` `new_column`
+            SQL,
+            $qb->renameColumn('non_exist_table', 'non_exist_column', 'new_column'),
+        );
     }
 
     /**
@@ -602,10 +615,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\Mysql\Tests;
+
+use Yiisoft\Db\Mysql\SqlParser;
+use Yiisoft\Db\Tests\AbstractSqlParserTest;
+
+/**
+ * @group mysql
+ */
+final class SqlParserTest extends AbstractSqlParserTest
+{
+    protected function createSqlParser(string $sql): SqlParser
+    {
+        return new SqlParser($sql);
+    }
+
+    /** @dataProvider \Yiisoft\Db\Mysql\Tests\Provider\SqlParserProvider::getNextPlaceholder */
+    public function testGetNextPlaceholder(string $sql, string|null $expectedPlaceholder, int|null $expectedPosition): void
+    {
+        parent::testGetNextPlaceholder($sql, $expectedPlaceholder, $expectedPosition);
+    }
+}