FIX Keep the alias for plain table names

archiprocode · Jul 25, 2024 · 732d8f9 · 732d8f9
1 parent b9d3ced
commit 732d8f9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/ORM/Queries/SQLConditionalExpression.php b/src/ORM/Queries/SQLConditionalExpression.php
@@ -78,7 +78,12 @@ public function addFrom($from)
         if (is_array($from)) {
             $this->from = array_merge($this->from, $from);
         } elseif (!empty($from)) {
-            $this->from[] = $from;
+            // $this->from[str_replace(['"','`'], '', $from)] = $from;
+            if (preg_match('/"?([a-zA-Z0-9_]+)"?/', $from)) {
+                $this->from[str_replace(['"','`'], '', $from)] = $from;
+            } else {
+                $this->from[] = $from;
+            }
         }
 
         return $this;