From 25127ad657ada59cb19571c90eb9485324b65d1a Mon Sep 17 00:00:00 2001
From: Tigrov <rrr-r@ya.ru>
Date: Wed, 23 Apr 2025 18:33:17 +0700
Subject: [PATCH 1/4] Remove `ExpressionBuilder`

---
 src/Builder/ExpressionBuilder.php | 16 ----------------
 src/DQLQueryBuilder.php           | 12 ------------
 src/QueryBuilder.php              |  5 +++++
 3 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 src/Builder/ExpressionBuilder.php

diff --git a/src/Builder/ExpressionBuilder.php b/src/Builder/ExpressionBuilder.php
deleted file mode 100644
index adddac1b5..000000000
--- a/src/Builder/ExpressionBuilder.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Db\Pgsql\Builder;
-
-use Yiisoft\Db\Expression\AbstractExpressionBuilder;
-use Yiisoft\Db\Pgsql\SqlParser;
-
-final class ExpressionBuilder extends AbstractExpressionBuilder
-{
-    protected function createSqlParser(string $sql): SqlParser
-    {
-        return new SqlParser($sql);
-    }
-}
diff --git a/src/DQLQueryBuilder.php b/src/DQLQueryBuilder.php
index 20a3845ff..9539967e6 100644
--- a/src/DQLQueryBuilder.php
+++ b/src/DQLQueryBuilder.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,
         ];
     }
diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
index 71d4f950a..5832e2d32 100644
--- a/src/QueryBuilder.php
+++ b/src/QueryBuilder.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);
+    }
 }

From 22eff66c1f7a496a19761e9d669cd23ba69226eb Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Wed, 23 Apr 2025 11:34:15 +0000
Subject: [PATCH 2/4] Apply fixes from StyleCI

---
 src/DQLQueryBuilder.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/DQLQueryBuilder.php b/src/DQLQueryBuilder.php
index 9539967e6..3c698e980 100644
--- a/src/DQLQueryBuilder.php
+++ b/src/DQLQueryBuilder.php
@@ -5,7 +5,6 @@
 namespace Yiisoft\Db\Pgsql;
 
 use Yiisoft\Db\Expression\ArrayExpression;
-use Yiisoft\Db\Expression\ExpressionBuilderInterface;
 use Yiisoft\Db\Expression\JsonExpression;
 use Yiisoft\Db\Expression\StructuredExpression;
 use Yiisoft\Db\Pgsql\Builder\ArrayExpressionBuilder;

From b160594ae92673484493c4d0c1a713bf1f9656b0 Mon Sep 17 00:00:00 2001
From: Tigrov <rrr-r@ya.ru>
Date: Wed, 23 Apr 2025 19:10:21 +0700
Subject: [PATCH 3/4] Update CHANGELOG.md [skip ci]

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d31ba3da3..7eaa681da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 2.0.0 under development
 
-- Enh #336: Implement `SqlParser` and `ExpressionBuilder` driver classes (@Tigrov)
+- Enh #336, #405: Implement `SqlParser` and `ExpressionBuilder` driver classes (@Tigrov)
 - New #315: Implement `ColumnSchemaInterface` classes according to the data type of database table columns
   for type casting performance. Related with yiisoft/db#752 (@Tigrov)
 - Chg #348: Replace call of `SchemaInterface::getRawTableName()` to `QuoterInterface::getRawTableName()` (@Tigrov)

From 08111e93063bd8f38fc182f693f6740c7e8d671e Mon Sep 17 00:00:00 2001
From: Tigrov <rrr-r@ya.ru>
Date: Thu, 24 Apr 2025 20:05:48 +0700
Subject: [PATCH 4/4] Update CHANGELOG.md [skip ci]

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7eaa681da..fef951e39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 2.0.0 under development
 
-- Enh #336, #405: Implement `SqlParser` and `ExpressionBuilder` driver classes (@Tigrov)
+- Enh #336, #405: Implement and use `SqlParser` class (@Tigrov)
 - New #315: Implement `ColumnSchemaInterface` classes according to the data type of database table columns
   for type casting performance. Related with yiisoft/db#752 (@Tigrov)
 - Chg #348: Replace call of `SchemaInterface::getRawTableName()` to `QuoterInterface::getRawTableName()` (@Tigrov)