PyPI - datajunction-server - Versions diffs - 0.0.1a45.dev2__tar.gz → 0.0.1a45.dev3__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datajunction-server
-Version: 0.0.1a45.dev2
+Version: 0.0.1a45.dev3
 Summary: DataJunction server library for running to a DataJunction server
 Project-URL: repository, https://github.com/DataJunction/dj
 Author-email: DataJunction Authors <yian.shang@gmail.com>

@@ -0,0 +1,4 @@
+"""
+Version for Hatch
+"""
+__version__ = "0.0.1a45.dev3"

@@ -877,6 +877,14 @@ def infer_type(
     return ct.StringType()
+@ConcatWs.register  # type: ignore
+def infer_type(
+    sep: ct.StringType,
+    *strings: ct.ListType,
+) -> ct.ColumnType:
+    return ct.StringType()
 class Contains(Function):
     """
     contains(left, right) - Returns a boolean. The value is True if right is found inside left.

@@ -620,8 +620,11 @@ def _(ctx: sbp.StringLitContext):
 def _(ctx: sbp.DereferenceContext):
     base = visit(ctx.base)
     field = visit(ctx.fieldName)
-    field.namespace = base.name
-    base.name = field
+    if isinstance(base, ast.Subscript) and isinstance(base.expr, ast.Column):
+        field.namespace = base.expr.name
+    if isinstance(base, ast.Column):
+        field.namespace = base.name
+        base.name = field
     return base

@@ -669,7 +669,9 @@ def test_concat_ws_func(session: Session):
     Test the `concat_ws` function
     """
     query = parse(
-        "SELECT concat_ws(',', 'hello', 'world'), concat_ws('-', 'spark', 'sql', 'function')",
+        "SELECT concat_ws(',', 'hello', 'world'), "
+        "concat_ws('-', 'spark', 'sql', 'function'), "
+        "concat_ws('-', array('spark', 'sql', 'function'))",
     )
     exc = DJException()
     ctx = ast.CompileContext(session=session, exception=exc)
@@ -677,6 +679,7 @@ def test_concat_ws_func(session: Session):
     assert not exc.errors
     assert query.select.projection[0].type == StringType()  # type: ignore
     assert query.select.projection[1].type == StringType()  # type: ignore
+    assert query.select.projection[2].type == StringType()  # type: ignore
 def test_collect_list(session: Session):

@@ -1017,3 +1017,23 @@ FROM VALUES
     ] == expected_columns
     assert query.select.from_.relations[0].primary.values == expected_values  # type: ignore
     assert query.columns[0].table.alias_or_name == expected_table_name  # type: ignore
+def test_ast_subscript_handling(session: Session):
+    """
+    Test parsing a query with subscripts
+    """
+    query_str = """SELECT
+  w.a[1]['a'] as a_,
+  w.a[1]['b'] as b_
+FROM VALUES
+  (array(named_struct('a', 1, 'b', 2)), array(named_struct('a', 300, 'b', 20))) AS w(a)"""
+    query = parse(str(query_str))
+    assert str(parse(str(query))) == str(parse(str(query_str)))
+    exc = DJException()
+    ctx = ast.CompileContext(session=session, exception=exc)
+    query.compile(ctx)
+    assert not exc.errors
+    assert [
+        (col.alias_or_name.name, col.type) for col in query.select.projection  # type: ignore
+    ] == [("a_", types.IntegerType()), ("b_", types.IntegerType())]

	@@ -1,2 +0,0 @@
1	- QUERY_SERVICE=http://host.docker.internal:8002
2	- SECRET=a-fake-secretkey

@@ -1,4 +0,0 @@
-"""
-Version for Hatch
-"""
-__version__ = "0.0.1a45.dev2"

datajunction-server 0.0.1a45.dev2__tar.gz → 0.0.1a45.dev3__tar.gz