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

---
 src/Builder/ExpressionBuilder.php | 16 ----------------
 src/DQLQueryBuilder.php           |  3 ---
 src/QueryBuilder.php              |  5 +++++
 3 files changed, 5 insertions(+), 19 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 ad38115..0000000
--- a/src/Builder/ExpressionBuilder.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Db\Oracle\Builder;
-
-use Yiisoft\Db\Expression\AbstractExpressionBuilder;
-use Yiisoft\Db\Oracle\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 d9e695c..ae5bedf 100644
--- a/src/DQLQueryBuilder.php
+++ b/src/DQLQueryBuilder.php
@@ -4,9 +4,7 @@
 
 namespace Yiisoft\Db\Oracle;
 
-use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Expression\ExpressionInterface;
-use Yiisoft\Db\Oracle\Builder\ExpressionBuilder;
 use Yiisoft\Db\Oracle\Builder\InConditionBuilder;
 use Yiisoft\Db\Oracle\Builder\LikeConditionBuilder;
 use Yiisoft\Db\Query\Query;
@@ -87,7 +85,6 @@ protected function defaultExpressionBuilders(): array
             ...parent::defaultExpressionBuilders(),
             InCondition::class => InConditionBuilder::class,
             LikeCondition::class => LikeConditionBuilder::class,
-            Expression::class => ExpressionBuilder::class,
         ];
     }
 }
diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
index 3bc6f40..fec71c2 100644
--- a/src/QueryBuilder.php
+++ b/src/QueryBuilder.php
@@ -37,4 +37,9 @@ protected function prepareBinary(string $binary): string
     {
         return "HEXTORAW('" . bin2hex($binary) . "')";
     }
+
+    protected function createSqlParser(string $sql): SqlParser
+    {
+        return new SqlParser($sql);
+    }
 }

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

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55fa4d2..13210cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 - Enh #268: Rename `batchInsert()` to `insertBatch()` in `DMLQueryBuilder` and change parameters 
   from `$table, $columns, $rows` to `$table, $rows, $columns = []` (@Tigrov)
 - Enh #260: Support `Traversable` values for `DMLQueryBuilder::batchInsert()` method with empty columns (@Tigrov)
-- Enh #255: Implement `SqlParser` and `ExpressionBuilder` driver classes (@Tigrov)
+- Enh #255, #321: Implement `SqlParser` and `ExpressionBuilder` driver classes (@Tigrov)
 - New #236: Implement `ColumnSchemaInterface` classes according to the data type of database table columns
   for type casting performance. Related with yiisoft/db#752 (@Tigrov)
 - Chg #272: Replace call of `SchemaInterface::getRawTableName()` to `QuoterInterface::getRawTableName()` (@Tigrov)

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

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13210cf..b9192f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 - Enh #268: Rename `batchInsert()` to `insertBatch()` in `DMLQueryBuilder` and change parameters 
   from `$table, $columns, $rows` to `$table, $rows, $columns = []` (@Tigrov)
 - Enh #260: Support `Traversable` values for `DMLQueryBuilder::batchInsert()` method with empty columns (@Tigrov)
-- Enh #255, #321: Implement `SqlParser` and `ExpressionBuilder` driver classes (@Tigrov)
+- Enh #255, #321: Implement and use `SqlParser` class (@Tigrov)
 - New #236: Implement `ColumnSchemaInterface` classes according to the data type of database table columns
   for type casting performance. Related with yiisoft/db#752 (@Tigrov)
 - Chg #272: Replace call of `SchemaInterface::getRawTableName()` to `QuoterInterface::getRawTableName()` (@Tigrov)