From 133d972646d9c26c4b120eb5c8e3e1d83880f7b6 Mon Sep 17 00:00:00 2001
From: Sergei Tigrov <rrr-r@ya.ru>
Date: Sun, 12 Nov 2023 17:29:54 +0700
Subject: [PATCH] Fix BC issues (#775)

* Fix BC issues

* Remove BC test

* revert removing `Generator`

---------

Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>
---
 .github/workflows/bc.yml                | 26 ++++++++-----------------
 src/Query/Query.php                     |  2 +-
 src/Query/QueryPartsInterface.php       |  5 ++---
 tests/Provider/QueryBuilderProvider.php |  1 -
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/bc.yml b/.github/workflows/bc.yml
index 00041a9f4..5970206c9 100644
--- a/.github/workflows/bc.yml
+++ b/.github/workflows/bc.yml
@@ -1,25 +1,15 @@
 on:
   pull_request:
-    paths-ignore:
-      - 'docs/**'
-      - 'README.md'
-      - 'CHANGELOG.md'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'infection.json.dist'
-      - 'phpunit.xml.dist'
-      - 'psalm.xml'
+    paths:
+      - 'src/**'
+      - '.github/workflows/bc.yml'
+      - 'composer.json'
   push:
     branches: ['master']
-    paths-ignore:
-      - 'docs/**'
-      - 'README.md'
-      - 'CHANGELOG.md'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'infection.json.dist'
-      - 'phpunit.xml.dist'
-      - 'psalm.xml'
+    paths:
+      - 'src/**'
+      - '.github/workflows/bc.yml'
+      - 'composer.json'
 
 name: backwards compatibility
 
diff --git a/src/Query/Query.php b/src/Query/Query.php
index 4ba681e7b..98e69b962 100644
--- a/src/Query/Query.php
+++ b/src/Query/Query.php
@@ -662,7 +662,7 @@ public function where(array|string|ExpressionInterface|null $condition, array $p
         return $this;
     }
 
-    public function withQuery(QueryInterface|string $query, ExpressionInterface|string $alias, bool $recursive = false): static
+    public function withQuery(QueryInterface|string $query, string $alias, bool $recursive = false): static
     {
         $this->withQueries[] = ['query' => $query, 'alias' => $alias, 'recursive' => $recursive];
         return $this;
diff --git a/src/Query/QueryPartsInterface.php b/src/Query/QueryPartsInterface.php
index 8c3ddfd84..f6b9ca974 100644
--- a/src/Query/QueryPartsInterface.php
+++ b/src/Query/QueryPartsInterface.php
@@ -645,11 +645,10 @@ public function where(array|string|ExpressionInterface|null $condition, array $p
      * Prepends an SQL statement using `WITH` syntax.
      *
      * @param QueryInterface|string $query The SQL statement to append using `UNION`.
-     * @param ExpressionInterface|string $alias The query alias in `WITH` construction.
-     * To specify the alias in plain SQL, you may pass an instance of {@see ExpressionInterface}.
+     * @param string $alias The query alias in `WITH` construction.
      * @param bool $recursive Its `true` if using `WITH RECURSIVE` and `false` if using `WITH`.
      */
-    public function withQuery(QueryInterface|string $query, ExpressionInterface|string $alias, bool $recursive = false): static;
+    public function withQuery(QueryInterface|string $query, string $alias, bool $recursive = false): static;
 
     /**
      * Specifies the `WITH` query clause for the query.
diff --git a/tests/Provider/QueryBuilderProvider.php b/tests/Provider/QueryBuilderProvider.php
index 8e04fc7b5..a70696668 100644
--- a/tests/Provider/QueryBuilderProvider.php
+++ b/tests/Provider/QueryBuilderProvider.php
@@ -1258,7 +1258,6 @@ public static function cteAliases(): array
             'with one column' => ['a(b)', '[[a]]([[b]])'],
             'with columns' => ['a(b,c,d)', '[[a]]([[b]], [[c]], [[d]])'],
             'with extra space' => ['a(b,c,d) ', 'a(b,c,d) '],
-            'expression' => [new Expression('a(b,c,d)'), 'a(b,c,d)'],
         ];
     }
 }