omnata-plugin-runtime 0.10.6a243__py3-none-any.whl → 0.10.6a244__py3-none-any.whl

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,17 @@ 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(self.main_part.direct_columns() +
+        main_columns:List[SnowflakeViewColumn] = SnowflakeViewColumn.order_by_reference(self.main_part.direct_columns() +
                                                               self.main_part.join_columns())
-        column_clauses = [c.definition() if c.is_join_column 
-                          else f"\"{self.main_part.stream_name}\"."+c.original_to_transformed()
+        column_clauses = [f"\"OMNATA_FINAL_CTE\"."+c.original_to_transformed()
                           for c in main_columns]
         
         view_body = f"""with {all_ctes}

{omnata_plugin_runtime-0.10.6a243.dist-info → omnata_plugin_runtime-0.10.6a244.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.6a243
+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.6a243.dist-info → omnata_plugin_runtime-0.10.6a244.dist-info}/RECORD

@@ -2,12 +2,12 @@ omnata_plugin_runtime/__init__.py,sha256=MS9d1whnfT_B3-ThqZ7l63QeC_8OEKTuaYV5wTw
 omnata_plugin_runtime/api.py,sha256=baGraSMiD4Yvi3ZWrEv_TKh8Ktd1U8riBdOpe9j0Puw,8202
 omnata_plugin_runtime/configuration.py,sha256=fpSyBr3Dr7GNdil88915VtMwRy5pexkGCRBk7BLFpPs,46527
 omnata_plugin_runtime/forms.py,sha256=9YHJ_T17lT-rwyDaUg_0yj_YMPda4DRCw_wrvf8hE0E,19964
-omnata_plugin_runtime/json_schema.py,sha256=IgOsQHahs5sNdBF5kyWdVttwFMSCJTt8wWt0NRhNMb8,30281
+omnata_plugin_runtime/json_schema.py,sha256=H2b9V8j6BbcsoXKbcvMdo3mcmi7yuhisQDDvQPN9u-k,30279
 omnata_plugin_runtime/logging.py,sha256=WBuZt8lF9E5oFWM4KYQbE8dDJ_HctJ1pN3BHwU6rcd0,4461
 omnata_plugin_runtime/omnata_plugin.py,sha256=M0b6f9lKKEoEI0zf-ZwZcIPKPQTmHTIMhvcrBc94Mhg,133278
 omnata_plugin_runtime/plugin_entrypoints.py,sha256=iqGl8_nEEnPGKg3Aem4YLSQ6d5xS3ju5gq8MJbx6sCA,31968
 omnata_plugin_runtime/rate_limiting.py,sha256=qpr5esU4Ks8hMzuMpSR3gLFdor2ZUXYWCjmsQH_K6lQ,25882
-omnata_plugin_runtime-0.10.6a243.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.10.6a243.dist-info/METADATA,sha256=LQXQSk2R81PNx0UQu3UOSCHWwu6P4NIl-CmOU80nA4c,2211
-omnata_plugin_runtime-0.10.6a243.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-omnata_plugin_runtime-0.10.6a243.dist-info/RECORD,,
+omnata_plugin_runtime-0.10.6a244.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.10.6a244.dist-info/METADATA,sha256=gLvf2vfyTaAStETaBzywqDRauNF0DifGJ0YUVWrO1Uk,2211
+omnata_plugin_runtime-0.10.6a244.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+omnata_plugin_runtime-0.10.6a244.dist-info/RECORD,,