move to new scope depth

hsheth2 · Oct 22, 2024 · e0fd167 · e0fd167
1 parent 6c80d1f
commit e0fd167
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/sqlglot/lineage.py b/sqlglot/lineage.py
@@ -294,12 +294,7 @@ def to_node(
             subfield = ".".join(subfields)
 
             node.downstream.append(
-                Node(
-                    name=c.sql(comments=False),
-                    source=source,
-                    expression=source,
-                    subfield=subfield,
-                )
+                Node(name=c.sql(comments=False), source=source, expression=source, subfield=subfield)
             )
 
     return node

diff --git a/sqlglot/optimizer/scope.py b/sqlglot/optimizer/scope.py
@@ -14,8 +14,6 @@
 
 TRAVERSABLES = (exp.Query, exp.DDL, exp.DML)
 
-MAX_SCOPE_DEPTH = 500
-
 
 class ScopeType(Enum):
     ROOT = auto()
@@ -454,7 +452,6 @@ def remove_source(self, name):
 
     def __repr__(self):
         return f"Scope<{self.expression.sql()}>"
-
     def traverse(self):
         """
         Traverse the scope tree from this node.
@@ -463,9 +460,16 @@ def traverse(self):
             Scope: scope instances in depth-first-search post-order
         """
         stack = [self]
+        seen_scopes = set()
         result = []
         while stack:
             scope = stack.pop()
+
+            # Scopes aren't hashable, so we use id(scope) instead.
+            if id(scope) in seen_scopes:
+                raise OptimizeError(f"Scope {scope} has a circular scope dependency")
+            seen_scopes.add(id(scope))
+
             result.append(scope)
             stack.extend(
                 itertools.chain(
@@ -475,11 +479,6 @@ def traverse(self):
                     scope.subquery_scopes,
                 )
             )
-            actual_depth = len(result)
-            if actual_depth > MAX_SCOPE_DEPTH:
-                raise OptimizeError(
-                    f"Scope depth limit of {MAX_SCOPE_DEPTH} exceeded"
-                )
 
         yield from reversed(result)