Skip to content

Commit 465a3ac

Browse files
Merge pull request #75 from e6data/removal_of_e62e6
Removal of e62e6 and source dialect while generating
2 parents e41f292 + ad063e3 commit 465a3ac

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

converter_api.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,14 @@ async def stats_api(
246246
# ------------------------------
247247
# Step 2: Transpile the Query
248248
# ------------------------------
249-
converted_query = sqlglot.transpile(query, read=from_sql, write=to_sql, identify=False)[
250-
0
251-
]
252-
converted_query = replace_struct_in_query(converted_query)
249+
tree = sqlglot.parse_one(query, read=from_sql, error_level=None)
250+
251+
tree2 = quote_identifiers(tree, dialect=to_sql)
252+
253+
double_quotes_added_query = tree2.sql(dialect=to_sql, from_dialect=from_sql)
254+
255+
double_quotes_added_query = replace_struct_in_query(double_quotes_added_query)
253256

254-
converted_query_ast = parse_one(converted_query, read=to_sql)
255-
double_quotes_added_query = quote_identifiers(converted_query_ast, dialect=to_sql).sql(
256-
dialect=to_sql
257-
)
258257
double_quotes_added_query = add_comment_to_query(double_quotes_added_query, comment)
259258

260259
all_functions_converted_query = extract_functions_from_query(
@@ -377,13 +376,14 @@ async def guardstats(
377376
values_ensured_ast = ensure_select_from_values(original_ast)
378377
query = values_ensured_ast.sql(dialect=from_sql)
379378

380-
converted_query = sqlglot.transpile(query, read=from_sql, write=to_sql, identify=False)[0]
381-
converted_query = replace_struct_in_query(converted_query)
379+
tree = sqlglot.parse_one(query, read=from_sql, error_level=None)
380+
381+
tree2 = quote_identifiers(tree, dialect=to_sql)
382+
383+
double_quotes_added_query = tree2.sql(dialect=to_sql, from_dialect=from_sql)
384+
385+
double_quotes_added_query = replace_struct_in_query(double_quotes_added_query)
382386

383-
converted_query_ast = parse_one(converted_query, read=to_sql)
384-
double_quotes_added_query = quote_identifiers(converted_query_ast, dialect=to_sql).sql(
385-
dialect=to_sql
386-
)
387387
double_quotes_added_query = add_comment_to_query(double_quotes_added_query, comment)
388388

389389
all_functions_converted_query = extract_functions_from_query(

sqlglot/generator.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,7 @@ class Generator(metaclass=_Generator):
661661
"_identifier_start",
662662
"_identifier_end",
663663
"_quote_json_path_key_using_brackets",
664+
"from_dialect",
664665
)
665666

666667
def __init__(
@@ -677,6 +678,7 @@ def __init__(
677678
max_text_width: int = 80,
678679
comments: bool = True,
679680
dialect: DialectType = None,
681+
from_dialect: t.Optional[str] = None,
680682
):
681683
import sqlglot
682684
from sqlglot.dialects import Dialect
@@ -692,6 +694,7 @@ def __init__(
692694
self.max_text_width = max_text_width
693695
self.comments = comments
694696
self.dialect = Dialect.get_or_raise(dialect)
697+
self.from_dialect = from_dialect
695698

696699
# This is both a Dialect property and a Generator argument, so we prioritize the latter
697700
self.normalize_functions = (

0 commit comments

Comments
 (0)