moved old functionalities to new parser

georgia-tech-db · Jan 8, 2021 · 49638f5 · 49638f5
1 parent 3668b21
commit 49638f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/parser/parser_visitor/_functions.py b/src/parser/parser_visitor/_functions.py
@@ -13,15 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from antlr4 import TerminalNode, ExecutionMode
+from antlr4 import TerminalNode
 
 from src.parser.evaql.evaql_parserVisitor import evaql_parserVisitor
 from src.parser.evaql.evaql_parser import evaql_parser
-
-from src.expression.function_expression import FunctionExpression
-
+from src.expression.function_expression import FunctionExpression, \
+    ExecutionMode
 from src.parser.create_udf_statement import CreateUDFStatement
-
 from src.utils.logging_manager import LoggingLevel, LoggingManager
 
 

diff --git a/test/parser/test_parser_visitor.py b/test/parser/test_parser_visitor.py
@@ -209,7 +209,7 @@ def test_visit_query_specification_base_exception(self):
     # UDFs
     ##################################################################
     @mock.patch.object(ParserVisitor, 'visit')
-    @mock.patch('src.parser.parser_visitor.FunctionExpression')
+    @mock.patch('src.parser.parser_visitor._functions.FunctionExpression')
     def test_visit_udf_function_call(self, func_mock, visit_mock):
         ctx = MagicMock()
         udf_name = 'name'
@@ -251,7 +251,7 @@ def test_visit_function_args(self, visit_mock):
         self.assertEqual(actual, [1, 2])
 
     @mock.patch.object(ParserVisitor, 'visit')
-    @mock.patch('src.parser.parser_visitor.CreateUDFStatement')
+    @mock.patch('src.parser.parser_visitor._functions.CreateUDFStatement')
     def test_visit_create_udf(self, create_udf_mock, visit_mock):
         ctx = MagicMock()
         ctx.children = [MagicMock() for i in range(5)]
@@ -300,7 +300,7 @@ def side_effect(arg):
     # LOAD DATA Statement
     ##################################################################
     @mock.patch.object(ParserVisitor, 'visit')
-    @mock.patch('src.parser.parser_visitor.LoadDataStatement')
+    @mock.patch('src.parser.parser_visitor._load_statement.LoadDataStatement')
     def test_visit_load_statement(self, mock_load, mock_visit):
         ctx = MagicMock()
         table = 'myVideo'