Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/substrait/sql/sql_to_substrait.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,13 @@ def translate(ast: dict, schema_resolver: SchemaResolver, registry: ExtensionReg
raise Exception(f"Unknown op {op}")


def convert(query: str, dialect: str, schema_resolver: SchemaResolver):
def convert(
query: str,
dialect: str,
schema_resolver: SchemaResolver,
registry: ExtensionRegistry = None,
):
ast = parse_sql(sql=query, dialect=dialect)[0]
registry = ExtensionRegistry(load_default_extensions=True)
if not registry:
registry = ExtensionRegistry(load_default_extensions=True)
return translate(ast, schema_resolver=schema_resolver, registry=registry)
7 changes: 5 additions & 2 deletions tests/sql/test_sql_to_substrait.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from substrait.extension_registry import ExtensionRegistry
from substrait.sql.sql_to_substrait import convert
import pyarrow
from google.protobuf import json_format
Expand Down Expand Up @@ -30,6 +31,8 @@
]
)

registry = ExtensionRegistry(load_default_extensions=True)


def sort_arrow(table: pyarrow.Table):
import pyarrow.compute as pc
Expand All @@ -52,7 +55,7 @@ def df_schema_resolver(name: str):
pa_schema = ctx.sql(f"SELECT * FROM {name} LIMIT 0").schema()
return pa_substrait.serialize_schema(pa_schema).to_pysubstrait().base_schema

plan = convert(query, "generic", df_schema_resolver)
plan = convert(query, "generic", df_schema_resolver, registry)

sql_arrow = ctx.sql(query).to_arrow_table()

Expand Down Expand Up @@ -86,7 +89,7 @@ def duckdb_schema_resolver(name: str):
conn.register("stores", data)
conn.register("sales", sales_data)

plan = convert(query, "duckdb", duckdb_schema_resolver)
plan = convert(query, "duckdb", duckdb_schema_resolver, registry)

conn.install_extension("substrait", repository="community")
conn.load_extension("substrait")
Expand Down