omnata-plugin-runtime 0.10.6a242__tar.gz → 0.10.6a244__tar.gz

{omnata_plugin_runtime-0.10.6a242 → omnata_plugin_runtime-0.10.6a244}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.6a242
+Version: 0.10.6a244
 Summary: Classes and common runtime components for building and running Omnata Plugins
 Author: James Weakley
 Author-email: james.weakley@omnata.com

{omnata_plugin_runtime-0.10.6a242 → omnata_plugin_runtime-0.10.6a244}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.10.6-a242"
+version = "0.10.6-a244"
 description = "Classes and common runtime components for building and running Omnata Plugins"
 authors = ["James Weakley <james.weakley@omnata.com>"]
 readme = "README.md"

{omnata_plugin_runtime-0.10.6a242 → omnata_plugin_runtime-0.10.6a244}/src/omnata_plugin_runtime/json_schema.py

@@ -257,13 +257,6 @@ class SnowflakeViewColumn(BaseModel):
                     if column not in columns_to_move:
                         columns_to_move.append(column)
         
-        # do another pass, this time replacing the original name with the transformed name
-        for column in join_columns:
-            for other_column in join_columns:
-                if f'"{column.original_name}"' in other_column.expression:
-                    if column.original_name != column.name:
-                        other_column.expression = other_column.expression.replace(f'"{column.original_name}"',f'"{column.name}"')
-
         # Move collected columns to the front
         for column in columns_to_move:
             join_columns.remove(column)
@@ -433,11 +426,19 @@ class SnowflakeViewParts(BaseModel):
         In the final select statement, the join columns will be aliased with their transformed names.
         """
         ctes = [self.main_part.cte_text(original_name=True)] + [part.cte_text(original_name=True) for part in self.joined_parts]
+        # we need a final CTE which selects the main part's direct columns and joined columns, with their original names
+        # then the final select statement will just be aliasing to the transformed names
+        final_cte = f""" OMNATA_FINAL_CTE as (
+            select {', '.join([c.definition(original_name=True) for c in self.main_part.direct_columns() + self.main_part.join_columns()])}
+            from "{self.main_part.stream_name}"
+        ) """
+        ctes.append(final_cte)
         all_ctes = "\n,".join(ctes)
-        main_columns = SnowflakeViewColumn.order_by_reference([c for c in self.main_part.columns if not c.is_join_column])
-        column_clauses = [c.definition() if c.is_join_column 
-                          else f"\"{self.main_part.stream_name}\"."+c.original_to_transformed()
-                          for c in main_columns]        
+        main_columns:List[SnowflakeViewColumn] = SnowflakeViewColumn.order_by_reference(self.main_part.direct_columns() +
+                                                              self.main_part.join_columns())
+        column_clauses = [f"\"OMNATA_FINAL_CTE\"."+c.original_to_transformed()
+                          for c in main_columns]
+        
         view_body = f"""with {all_ctes}
     select {', '.join(column_clauses)}
     from "{self.main_part.stream_name}" """