From e2c6f56ecf90d2ce2a8beac6ec74e2b91cbe4f06 Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Sat, 30 Jul 2022 10:01:35 -0700
Subject: [PATCH] Represent query type as enum in QueryBuilder

---
 UPGRADE.md                 |  8 ++++--
 psalm.xml.dist             |  8 ------
 src/Query/QueryBuilder.php | 50 +++++++++-----------------------------
 src/Query/QueryType.php    | 16 ++++++++++++
 4 files changed, 33 insertions(+), 49 deletions(-)
 create mode 100644 src/Query/QueryType.php

diff --git a/UPGRADE.md b/UPGRADE.md
index 6c37151262d..5ac8df9a786 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -299,8 +299,12 @@ The following `QueryBuilder` methods have been removed:
 
 The following `QueryBuilder` constants have been removed:
 
-1. `STATE_DIRTY`,
-2. `STATE_CLEAN`.
+1. `SELECT`,
+2. `DELETE`,
+3. `UPDATE`,
+4. `INSERT`,
+5. `STATE_DIRTY`,
+6. `STATE_CLEAN`.
 
 ## BC BREAK: Removed the `Constraint` interface.
 
diff --git a/psalm.xml.dist b/psalm.xml.dist
index 0f871581af5..f6e62d924bb 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -32,14 +32,6 @@
                 <file name="src/Driver/OCI8/ConvertPositionalToNamedPlaceholders.php"/>
             </errorLevel>
         </ConflictingReferenceConstraint>
-        <DeprecatedConstant>
-            <errorLevel type="suppress">
-                <!--
-                    TODO: remove in 4.0.0
-                -->
-                <file name="src/Query/QueryBuilder.php"/>
-            </errorLevel>
-        </DeprecatedConstant>
         <DeprecatedMethod>
             <errorLevel type="suppress">
                 <!--
diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php
index 0ca626b0bc0..60d6178d9aa 100644
--- a/src/Query/QueryBuilder.php
+++ b/src/Query/QueryBuilder.php
@@ -37,26 +37,6 @@
  */
 class QueryBuilder
 {
-    /**
-     * @deprecated
-     */
-    final public const SELECT = 0;
-
-    /**
-     * @deprecated
-     */
-    final public const DELETE = 1;
-
-    /**
-     * @deprecated
-     */
-    final public const UPDATE = 2;
-
-    /**
-     * @deprecated
-     */
-    final public const INSERT = 3;
-
     /**
      * The complete SQL string for this query.
      */
@@ -79,7 +59,7 @@ class QueryBuilder
     /**
      * The type of query this is. Can be select, update or delete.
      */
-    private int $type = self::SELECT;
+    private QueryType $type = QueryType::SELECT;
 
     /**
      * The index of the first result to retrieve.
@@ -343,20 +323,12 @@ public function executeStatement(): int|string
      */
     public function getSQL(): string
     {
-        if ($this->sql !== null) {
-            return $this->sql;
-        }
-
-        $sql = match ($this->type) {
-            self::INSERT => $this->getSQLForInsert(),
-            self::DELETE => $this->getSQLForDelete(),
-            self::UPDATE => $this->getSQLForUpdate(),
-            default => $this->getSQLForSelect(),
+        return $this->sql ??= match ($this->type) {
+            QueryType::INSERT => $this->getSQLForInsert(),
+            QueryType::DELETE => $this->getSQLForDelete(),
+            QueryType::UPDATE => $this->getSQLForUpdate(),
+            QueryType::SELECT => $this->getSQLForSelect(),
         };
-
-        $this->sql = $sql;
-
-        return $sql;
     }
 
     /**
@@ -539,7 +511,7 @@ public function getMaxResults(): ?int
      */
     public function select(string ...$expressions): self
     {
-        $this->type = self::SELECT;
+        $this->type = QueryType::SELECT;
 
         if (count($expressions) < 1) {
             return $this;
@@ -591,7 +563,7 @@ public function distinct(): self
      */
     public function addSelect(string $expression, string ...$expressions): self
     {
-        $this->type = self::SELECT;
+        $this->type = QueryType::SELECT;
 
         $this->select = array_merge($this->select, [$expression], $expressions);
 
@@ -617,7 +589,7 @@ public function addSelect(string $expression, string ...$expressions): self
      */
     public function delete(string $table): self
     {
-        $this->type = self::DELETE;
+        $this->type = QueryType::DELETE;
 
         $this->table = $table;
 
@@ -643,7 +615,7 @@ public function delete(string $table): self
      */
     public function update(string $table): self
     {
-        $this->type = self::UPDATE;
+        $this->type = QueryType::UPDATE;
 
         $this->table = $table;
 
@@ -673,7 +645,7 @@ public function update(string $table): self
      */
     public function insert(string $table): self
     {
-        $this->type = self::INSERT;
+        $this->type = QueryType::INSERT;
 
         $this->table = $table;
 
diff --git a/src/Query/QueryType.php b/src/Query/QueryType.php
new file mode 100644
index 00000000000..5544ffd8bd4
--- /dev/null
+++ b/src/Query/QueryType.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Query;
+
+/**
+ * @internal
+ */
+enum QueryType
+{
+    case SELECT;
+    case DELETE;
+    case UPDATE;
+    case INSERT;
+}