Merge branch 'master' into allow_scalars

CHANGELOG.md

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

docs/pt-BR/testing.md

@@ -0,0 +1,51 @@
+# Testes
+
+## Ações do Github
+
+Todos os nossos pacotes possuem ações do github por padrão, então você pode testar sua [contribuição](https://github.com/yiisoft/db-sqlite/blob/master/.github/CONTRIBUTING.md) na nuvem.
+
+> Observação: recomendamos a solicitação pull no modo rascunho até que todos os testes sejam aprovados.
+
+## Teste de unidade
+
+O pacote é testado com [PHPUnit](https://phpunit.de/).
+
+```shell
+vendor/bin/phpunit
+```
+
+### Teste de mutação
+
+Os testes do pacote são verificados com a estrutura de mutação [Infection](https://infection.github.io/) e com
+[plugin de análise estática de infecção](https://github.com/Roave/infection-static-analysis-plugin). Para executá-lo:
+
+```shell
+./vendor/bin/roave-infection-static-analysis-plugin
+```
+
+## Análise estática
+
+O código é analisado estaticamente com [Psalm](https://psalm.dev/). Para executar a análise estática:
+
+```shell
+./vendor/bin/psalm
+```
+
+## Reitor
+
+Use [Rector](https://github.com/rectorphp/rector) para fazer a base de código seguir algumas regras específicas ou
+use a versão mais recente ou qualquer versão específica do PHP:
+
+```shell
+./vendor/bin/rector
+```
+
+## Composer requer verificador
+
+Este pacote usa [composer-require-checker](https://github.com/maglnet/ComposerRequireChecker) para verificar se todas as dependências estão definidas corretamente em `composer.json`.
+
+Para executar o verificador, execute o seguinte comando:
+
+```shell
+./vendor/bin/composer-require-checker
+```

src/Builder/ExpressionBuilder.php

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

src/DQLQueryBuilder.php

@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Db\Sqlite;
 
+use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Expression\ExpressionBuilderInterface;
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Expression\JsonExpression;
@@ -12,6 +13,7 @@
 use Yiisoft\Db\QueryBuilder\AbstractDQLQueryBuilder;
 use Yiisoft\Db\QueryBuilder\Condition\InCondition;
 use Yiisoft\Db\QueryBuilder\Condition\LikeCondition;
+use Yiisoft\Db\Sqlite\Builder\ExpressionBuilder;
 use Yiisoft\Db\Sqlite\Builder\InConditionBuilder;
 use Yiisoft\Db\Sqlite\Builder\JsonExpressionBuilder;
 use Yiisoft\Db\Sqlite\Builder\LikeConditionBuilder;
@@ -136,6 +138,7 @@ protected function defaultExpressionBuilders(): array
             LikeCondition::class => LikeConditionBuilder::class,
             InCondition::class => InConditionBuilder::class,
             JsonExpression::class => JsonExpressionBuilder::class,
+            Expression::class => ExpressionBuilder::class,
         ]);
     }
 }

src/SqlParser.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Sqlite;
+
+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

@@ -465,9 +465,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,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Sqlite\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',
+                11,
+            ],
+            [
+                '[[:field]] = :name AND age = :age',
+                ':name',
+                13,
+            ],
+        ];
+    }
+}

tests/QueryBuilderTest.php

@@ -703,10 +703,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\Sqlite\Tests;
+
+use Yiisoft\Db\Sqlite\SqlParser;
+use Yiisoft\Db\Tests\AbstractSqlParserTest;
+
+/**
+ * @group sqlite
+ */
+final class SqlParserTest extends AbstractSqlParserTest
+{
+    protected function createSqlParser(string $sql): SqlParser
+    {
+        return new SqlParser($sql);
+    }
+
+    /** @dataProvider \Yiisoft\Db\Sqlite\Tests\Provider\SqlParserProvider::getNextPlaceholder */
+    public function testGetNextPlaceholder(string $sql, string|null $expectedPlaceholder, int|null $expectedPosition): void
+    {
+        parent::testGetNextPlaceholder($sql, $expectedPlaceholder, $expectedPosition);
+    }
+}