diff --git a/ibis/backends/duckdb/compiler/values.py b/ibis/backends/duckdb/compiler/values.py index b1cef43daea29..72afbcb9909b2 100644 --- a/ibis/backends/duckdb/compiler/values.py +++ b/ibis/backends/duckdb/compiler/values.py @@ -542,8 +542,8 @@ def _levenshtein(op, **kw): ops.NullIf: "nullIf", ops.MapContains: "mapContains", # TODO ops.MapLength: "length", - ops.MapKeys: "mapKeys", # TODO - ops.MapValues: "mapValues", # TODO + ops.MapKeys: "map_keys", + ops.MapValues: "map_values", ops.MapMerge: "mapUpdate", # TODO ops.ArraySort: "list_sort", ops.ArrayContains: "has", @@ -650,7 +650,6 @@ def _in_column(op, **kw): ### LITERALLY -# TODO: need to go through this carefully @translate_val.register(ops.Literal) def _literal(op, **kw): value = op.value @@ -681,7 +680,14 @@ def _literal(op, **kw): ) # TODO: handle if `value` is "Infinity" - + # precision = sg.expressions.DataTypeParam( + # this=sg.expressions.Literal(this=f"{precision}", is_string=False) + # ) + # scale = sg.expressions.DataTypeParam( + # this=sg.expressions.Literal(this=f"{scale}", is_string=False) + # ) + # need sg.expressions.DataTypeParam to be available + # ... return f"{value!s}::decimal({precision}, {scale})" elif dtype.is_numeric(): if math.isinf(value): @@ -734,7 +740,7 @@ def _literal(op, **kw): elif dtype.is_map(): value_type = dtype.value_type values = ", ".join( - f"{k!r}, {_literal(ops.Literal(v, dtype=value_type), **kw)}" + f"[{k!r}, {_literal(ops.Literal(v, dtype=value_type), **kw)}]" for k, v in value.items() ) return f"map({values})" @@ -1198,6 +1204,10 @@ def _map(op, **kw): keys = translate_val(op.keys, **kw) values = translate_val(op.values, **kw) typ = serialize(op.dtype) + breakpoint() + sg_expr = sg.expressions.Map(keys=keys, values=values) + breakpoint() + return sg_expr return f"CAST(({keys}, {values}) AS {typ})" @@ -1481,7 +1491,8 @@ def _array_map(op, **kw): def _array_filter(op, **kw): arg = translate_val(op.arg, **kw) result = translate_val(op.result, **kw) - return sg.func("list_filter", arg, f"{op.parameter} -> {result}") + func = sg.func("list_filter", arg, f"{op.parameter} -> {result}") + return func @translate_val.register(ops.ArrayPosition) @@ -1501,13 +1512,11 @@ def _array_union(op, **kw): return translate_val(ops.ArrayDistinct(ops.ArrayConcat(op.left, op.right)), **kw) -# TODO +# TODO: need to do this as a an array map + struct pack -- look at existing +# alchemy backend implementation @translate_val.register(ops.ArrayZip) def _array_zip(op: ops.ArrayZip, **kw: Any) -> str: - arglist = [] - for arg in op.arg: - sql_arg = translate_val(arg, **kw) - with contextlib.suppress(AttributeError): - sql_arg = sql_arg.sql(dialect="duckdb") - arglist.append(sql_arg) - return f"arrayZip({', '.join(arglist)})" + zipped = sg.expressions.ArrayJoin().from_arg_list( + [translate_val(arg, **kw) for arg in op.arg] + ) + return zipped