From 0cad70683caa166fdf217654076e3d8d4fba02b2 Mon Sep 17 00:00:00 2001 From: Shicheng Liu Date: Tue, 16 Apr 2024 20:55:01 +0000 Subject: [PATCH] `1.1.4a0` release --- setup.py | 2 +- .../execute_free_text_sql.py | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 37c5d0b..95199ab 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ # Package metadata name = "suql" -version = "1.1.3" +version = "1.1.4a0" description = "Structured and Unstructured Query Language (SUQL) Python API" author = "Shicheng Liu" author_email = "shicheng@cs.stanford.edu" diff --git a/src/suql/sql_free_text_support/execute_free_text_sql.py b/src/suql/sql_free_text_support/execute_free_text_sql.py index dc6b631..4f25172 100644 --- a/src/suql/sql_free_text_support/execute_free_text_sql.py +++ b/src/suql/sql_free_text_support/execute_free_text_sql.py @@ -57,6 +57,44 @@ def _if_contains_free_text_fcn(node): return visitor.res +def _extract_all_free_text_fcns(suql): + node = parse_sql(suql) + visitor = _ExtractAllFreeTextFncs() + visitor(node) + return visitor.res + + +class _ExtractAllFreeTextFncs(Visitor): + def __init__(self) -> None: + super().__init__() + self._SET_FREE_TEXT_FCNS = _SET_FREE_TEXT_FCNS + self.res = [] + + def __call__(self, node): + self.node = node + super().__call__(node) + + def visit_FuncCall(self, ancestors, node: pglast.ast.FuncCall): + for i in node.funcname: + if i.sval in self._SET_FREE_TEXT_FCNS: + query_lst = list( + filter(lambda x: isinstance(x, A_Const), node.args) + ) + assert len(query_lst) == 1 + query = query_lst[0].val.sval + + field_lst = list( + filter(lambda x: isinstance(x, ColumnRef), node.args) + ) + assert len(field_lst) == 1 + + field = tuple(map(lambda x: x.sval, field_lst[0].fields)) + + self.res.append( + (field, query) + ) + + class _TypeCastAnswer(Visitor): def __init__(self) -> None: super().__init__()