pytrilogy 0.0.1.105__py3-none-any.whl → 0.0.1.107__py3-none-any.whl

trilogy/executor.py

@@ -99,7 +99,14 @@ class Executor(object):
         raise NotImplementedError("Cannot execute type {}".format(type(query)))
 
     @execute_query.register
-    def _(self, query: SelectStatement | PersistStatement) -> CursorResult:
+    def _(self, query: SelectStatement) -> CursorResult:
+        sql = self.generator.generate_queries(
+            self.environment, [query], hooks=self.hooks
+        )
+        return self.execute_query(sql[0])
+
+    @execute_query.register
+    def _(self, query: PersistStatement) -> CursorResult:
         sql = self.generator.generate_queries(
             self.environment, [query], hooks=self.hooks
         )
@@ -117,16 +124,22 @@ class Executor(object):
         )
 
     @execute_query.register
-    def _(self, query: ProcessedQuery | ProcessedQueryPersist) -> CursorResult:
+    def _(self, query: ProcessedQuery) -> CursorResult:
+        sql = self.generator.compile_statement(query)
+        # connection = self.engine.connect()
+        output = self.connection.execute(text(sql))
+        return output
+
+    @execute_query.register
+    def _(self, query: ProcessedQueryPersist) -> CursorResult:
         sql = self.generator.compile_statement(query)
         # connection = self.engine.connect()
         output = self.connection.execute(text(sql))
-        if isinstance(query, ProcessedQueryPersist):
-            self.environment.add_datasource(query.datasource)
+        self.environment.add_datasource(query.datasource)
         return output
 
     @singledispatchmethod
-    def generate_sql(self, command: ProcessedQuery | str) -> list[str]:
+    def generate_sql(self, command) -> list[str]:
         raise NotImplementedError(
             "Cannot generate sql for type {}".format(type(command))
         )

trilogy/parsing/parse_engine.py

@@ -864,7 +864,7 @@ class ParseToObjects(Transformer):
             elif isinstance(val, Grain):
                 grain = val
             elif isinstance(val, Query):
-                address = Address(location=f"({val.text})")
+                address = Address(location=f"({val.text})", is_query=True)
         if not address:
             raise ValueError(
                 "Malformed datasource, missing address or query declaration"