Remove ExpressionBuilder

Author: Tigrov

src/Builder/ExpressionBuilder.php

@@ -5,7 +5,6 @@
 namespace Yiisoft\Db\Pgsql;
 
 use Yiisoft\Db\Expression\ArrayExpression;
-use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Expression\ExpressionBuilderInterface;
 use Yiisoft\Db\Expression\JsonExpression;
 use Yiisoft\Db\Expression\StructuredExpression;
@@ -14,7 +13,6 @@
 use Yiisoft\Db\Pgsql\Builder\JsonOverlapsConditionBuilder;
 use Yiisoft\Db\Pgsql\Builder\LikeConditionBuilder;
 use Yiisoft\Db\Pgsql\Builder\StructuredExpressionBuilder;
-use Yiisoft\Db\Pgsql\Builder\ExpressionBuilder;
 use Yiisoft\Db\Pgsql\Builder\JsonExpressionBuilder;
 use Yiisoft\Db\QueryBuilder\AbstractDQLQueryBuilder;
 use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlapsCondition;
@@ -44,15 +42,6 @@ protected function defaultConditionClasses(): array
         ];
     }
 
-    /**
-     * 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.
-     *
-     * @psalm-return array<string, class-string<ExpressionBuilderInterface>>
-     */
     protected function defaultExpressionBuilders(): array
     {
         return [
@@ -62,7 +51,6 @@ protected function defaultExpressionBuilders(): array
             JsonExpression::class => JsonExpressionBuilder::class,
             JsonOverlapsCondition::class => JsonOverlapsConditionBuilder::class,
             StructuredExpression::class => StructuredExpressionBuilder::class,
-            Expression::class => ExpressionBuilder::class,
             LikeCondition::class => LikeConditionBuilder::class,
         ];
     }

src/DQLQueryBuilder.php

@@ -33,4 +33,9 @@ protected function prepareBinary(string $binary): string
     {
         return "'\x" . bin2hex($binary) . "'::bytea";
     }
+
+    protected function createSqlParser(string $sql): SqlParser
+    {
+        return new SqlParser($sql);
+    }
 }