Remove ExpressionBuilder

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 - 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)
+- Enh #321, #391: Implement and use `SqlParser` class (@Tigrov)
 - Chg #339: Replace call of `SchemaInterface::getRawTableName()` to `QuoterInterface::getRawTableName()` (@Tigrov)
 - New #342: Add JSON overlaps condition builder (@Tigrov)
 - Enh #344: Update `bit` type according to main PR yiisoft/db#860 (@Tigrov)

src/DQLQueryBuilder.php

@@ -4,9 +4,7 @@
 
 namespace Yiisoft\Db\Mysql;
 
-use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Expression\ExpressionInterface;
-use Yiisoft\Db\Mysql\Builder\ExpressionBuilder;
 use Yiisoft\Db\Mysql\Builder\JsonOverlapsConditionBuilder;
 use Yiisoft\Db\Mysql\Builder\LikeConditionBuilder;
 use Yiisoft\Db\QueryBuilder\AbstractDQLQueryBuilder;
@@ -72,19 +70,11 @@ protected function hasOffset(mixed $offset): bool
         return ctype_digit($offset) && $offset !== '0';
     }
 
-    /**
-     * Has an array of default expression builders.
-     *
-     * Extend this method and override it if you want to change default expression builders for this query builder.
-     *
-     * {@see ExpressionBuilder} docs for details.
-     */
     protected function defaultExpressionBuilders(): array
     {
         return [
             ...parent::defaultExpressionBuilders(),
             JsonOverlapsCondition::class => JsonOverlapsConditionBuilder::class,
-            Expression::class => ExpressionBuilder::class,
             LikeCondition::class => LikeConditionBuilder::class,
         ];
     }

src/QueryBuilder.php

@@ -26,4 +26,9 @@ public function __construct(ConnectionInterface $db)
             new ColumnDefinitionBuilder($this),
         );
     }
+
+    protected function createSqlParser(string $sql): SqlParser
+    {
+        return new SqlParser($sql);
+    }
 }