From 90150543f9314be683d22a16339effd774192f6d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 22 Sep 2022 06:31:28 +0200
Subject: Merging upstream version 6.1.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 sqlglot/executor/__init__.py | 10 ++++++++--
 sqlglot/executor/context.py  |  4 +---
 sqlglot/executor/python.py   | 14 +++-----------
 sqlglot/executor/table.py    |  5 +----
 4 files changed, 13 insertions(+), 20 deletions(-)

(limited to 'sqlglot/executor')

diff --git a/sqlglot/executor/__init__.py b/sqlglot/executor/__init__.py
index a437431..bca9f3e 100644
--- a/sqlglot/executor/__init__.py
+++ b/sqlglot/executor/__init__.py
@@ -3,11 +3,17 @@ import time
 
 from sqlglot import parse_one
 from sqlglot.executor.python import PythonExecutor
-from sqlglot.optimizer import optimize
+from sqlglot.optimizer import RULES, optimize
+from sqlglot.optimizer.merge_derived_tables import merge_derived_tables
 from sqlglot.planner import Plan
 
 logger = logging.getLogger("sqlglot")
 
+OPTIMIZER_RULES = list(RULES)
+
+# The executor needs isolated table selects
+OPTIMIZER_RULES.remove(merge_derived_tables)
+
 
 def execute(sql, schema, read=None):
     """
@@ -28,7 +34,7 @@ def execute(sql, schema, read=None):
     """
     expression = parse_one(sql, read=read)
     now = time.time()
-    expression = optimize(expression, schema)
+    expression = optimize(expression, schema, rules=OPTIMIZER_RULES)
     logger.debug("Optimization finished: %f", time.time() - now)
     logger.debug("Optimized SQL: %s", expression.sql(pretty=True))
     plan = Plan(expression)
diff --git a/sqlglot/executor/context.py b/sqlglot/executor/context.py
index 457bea7..d265a2c 100644
--- a/sqlglot/executor/context.py
+++ b/sqlglot/executor/context.py
@@ -19,9 +19,7 @@ class Context:
             env (Optional[dict]): dictionary of functions within the execution context
         """
         self.tables = tables
-        self.range_readers = {
-            name: table.range_reader for name, table in self.tables.items()
-        }
+        self.range_readers = {name: table.range_reader for name, table in self.tables.items()}
         self.row_readers = {name: table.reader for name, table in tables.items()}
         self.env = {**(env or {}), "scope": self.row_readers}
 
diff --git a/sqlglot/executor/python.py b/sqlglot/executor/python.py
index 388a419..610aa4b 100644
--- a/sqlglot/executor/python.py
+++ b/sqlglot/executor/python.py
@@ -26,11 +26,7 @@ class PythonExecutor:
         while queue:
             node = queue.pop()
             context = self.context(
-                {
-                    name: table
-                    for dep in node.dependencies
-                    for name, table in contexts[dep].tables.items()
-                }
+                {name: table for dep in node.dependencies for name, table in contexts[dep].tables.items()}
             )
             running.add(node)
 
@@ -151,9 +147,7 @@ class PythonExecutor:
             return self.context({name: table for name in ctx.tables})
 
         for name, join in step.joins.items():
-            join_context = self.context(
-                {**join_context.tables, name: context.tables[name]}
-            )
+            join_context = self.context({**join_context.tables, name: context.tables[name]})
 
             if join.get("source_key"):
                 table = self.hash_join(join, source, name, join_context)
@@ -247,9 +241,7 @@ class PythonExecutor:
 
         if step.operands:
             source_table = context.tables[source]
-            operand_table = Table(
-                source_table.columns + self.table(step.operands).columns
-            )
+            operand_table = Table(source_table.columns + self.table(step.operands).columns)
 
             for reader, ctx in context:
                 operand_table.append(reader.row + ctx.eval_tuple(operands))
diff --git a/sqlglot/executor/table.py b/sqlglot/executor/table.py
index 6df49f7..80674cb 100644
--- a/sqlglot/executor/table.py
+++ b/sqlglot/executor/table.py
@@ -37,10 +37,7 @@ class Table:
                 break
 
             lines.append(
-                " ".join(
-                    str(row[column]).rjust(widths[column])[0 : widths[column]]
-                    for column in self.columns
-                )
+                " ".join(str(row[column]).rjust(widths[column])[0 : widths[column]] for column in self.columns)
             )
         return "\n".join(lines)
 
-- 
cgit v1.2.3