chore: fix overlapping args for trino, postgres, bigquery and pyspark

ibis-project · Dec 14, 2023 · 2e7fb76 · 2e7fb76
1 parent 45fc0ac
commit 2e7fb76
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/ibis/backends/bigquery/registry.py b/ibis/backends/bigquery/registry.py
@@ -944,7 +944,7 @@ def _integer_range(translator, op):
     ops.EndsWith: fixed_arity("ENDS_WITH", 2),
     ops.TableColumn: table_column,
     ops.CountDistinctStar: _count_distinct_star,
-    ops.Argument: lambda _, op: op.name,
+    ops.Argument: lambda _, op: op.param,
     ops.Unnest: unary("UNNEST"),
     ops.TimeDelta: _time_delta,
     ops.DateDelta: _date_delta,

diff --git a/ibis/backends/postgres/registry.py b/ibis/backends/postgres/registry.py
@@ -644,7 +644,9 @@ def _integer_range(t, op):
         ops.Literal: _literal,
         # We override this here to support time zones
         ops.TableColumn: _table_column,
-        ops.Argument: lambda t, op: sa.column(op.name, type_=t.get_sqla_type(op.dtype)),
+        ops.Argument: lambda t, op: sa.column(
+            op.param, type_=t.get_sqla_type(op.dtype)
+        ),
         # types
         ops.TypeOf: _typeof,
         # Floating

diff --git a/ibis/backends/pyspark/compiler.py b/ibis/backends/pyspark/compiler.py
@@ -1689,7 +1689,7 @@ def compile_array_collect(t, op, **kwargs):
 
 @compiles(ops.Argument)
 def compile_argument(t, op, arg_columns, **kwargs):
-    return arg_columns[op.name]
+    return arg_columns[op.param]
 
 
 @compiles(ops.ArrayFilter)

diff --git a/ibis/backends/trino/registry.py b/ibis/backends/trino/registry.py
@@ -327,7 +327,7 @@ def _try_cast(t, op):
 def _array_intersect(t, op):
     x = ops.Argument(name="x", shape=op.left.shape, dtype=op.left.dtype.value_type)
     return t.translate(
-        ops.ArrayFilter(op.left, param="x", body=ops.ArrayContains(op.right, x))
+        ops.ArrayFilter(op.left, param=x.param, body=ops.ArrayContains(op.right, x))
     )
 
 
@@ -538,7 +538,7 @@ def _integer_range(t, op):
             lambda sep, arr: sa.func.array_join(arr, sep), 2
         ),
         ops.StartsWith: fixed_arity(sa.func.starts_with, 2),
-        ops.Argument: lambda _, op: sa.literal_column(op.name),
+        ops.Argument: lambda _, op: sa.literal_column(op.param),
         ops.First: partial(_first_last, offset=1),
         ops.Last: partial(_first_last, offset=-1),
         ops.ArrayZip: _zip,