omnata-plugin-runtime 0.10.7a250__py3-none-any.whl → 0.10.7a253__py3-none-any.whl

omnata_plugin_runtime/json_schema.py

@@ -264,6 +264,8 @@ class SnowflakeViewColumn(BaseModel):
 
         for column in join_columns:
             for other_column in join_columns:
+                if column==other_column:
+                    continue
                 if f'"{column.original_name}"' in other_column.expression:
                     if column not in columns_to_move:
                         columns_to_move.append(column)
@@ -404,7 +406,7 @@ class SnowflakeViewPart(BaseModel):
         # the outer view definition has all of the column names and comments, but with the direct columns
         # first and the join columns last, same as they are ordered in the inner query
         return [
-            c.name_with_comment(binding_list) for c in (self.direct_columns() + self.join_columns())
+            c.name_with_comment(binding_list) for c in self.columns
         ]
     
     def cte_text(self,original_name: bool = False) -> str:
@@ -454,8 +456,7 @@ class SnowflakeViewParts(BaseModel):
 
         ctes.append(final_cte)
         all_ctes = "\n,".join(ctes)
-        main_columns:List[SnowflakeViewColumn] = SnowflakeViewColumn.order_by_reference(self.main_part.direct_columns() +
-                                                              self.main_part.join_columns())
+        main_columns:List[SnowflakeViewColumn] = self.main_part.columns
         column_clauses = [f"\"OMNATA_FINAL_CTE\"."+c.original_to_transformed()
                           for c in main_columns]
         
@@ -675,7 +676,15 @@ def normalized_view_part(
         if json_schema.joins:
             joins = json_schema.joins
         comment = json_schema.description
-
+    
+    direct_view_columns = [c for c in view_columns if c.is_join_column]
+    join_view_columns = [c for c in view_columns if not c.is_join_column]
+    # The final order of view columns is:
+    #- APP_IDENTIFIER
+    #- Direct and joined columns, ordered so that columns that reference other columns are defined after the columns they reference
+    #- OMNATA_RETRIEVE_DATE, OMNATA_RAW_RECORD, OMNATA_IS_DELETED, OMNATA_RUN_ID
+    view_columns = SnowflakeViewColumn.order_by_reference(direct_view_columns +
+                                                              join_view_columns)
     return SnowflakeViewPart(
         stream_name=stream_name,
         raw_table_location=raw_table_location,

{omnata_plugin_runtime-0.10.7a250.dist-info → omnata_plugin_runtime-0.10.7a253.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.7a250
+Version: 0.10.7a253
 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.7a250.dist-info → omnata_plugin_runtime-0.10.7a253.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=0rfIGv8rCu8OwL7m-VOXIBjd05iyaBWRdt2h9o6scwo,46754
 omnata_plugin_runtime/forms.py,sha256=9YHJ_T17lT-rwyDaUg_0yj_YMPda4DRCw_wrvf8hE0E,19964
-omnata_plugin_runtime/json_schema.py,sha256=Kng9tCG4vHkt-p8XUuvTrzYXudmc8r0dgvQVQn6KrAs,30918
+omnata_plugin_runtime/json_schema.py,sha256=uwNE3-Rq5y0EpMsAcSTUQgTe8Ti-ePga64Xeh7IvD_E,31400
 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.7a250.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.10.7a250.dist-info/METADATA,sha256=cArWu-lk5ftYw5xTFkzgtm2PJVYMYOg6lB4kKEbCOYU,2211
-omnata_plugin_runtime-0.10.7a250.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-omnata_plugin_runtime-0.10.7a250.dist-info/RECORD,,
+omnata_plugin_runtime-0.10.7a253.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.10.7a253.dist-info/METADATA,sha256=e1U9BxIb68KmvKxvNFcAMMcBGjgPGa2GFT_Hns-pw2U,2211
+omnata_plugin_runtime-0.10.7a253.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+omnata_plugin_runtime-0.10.7a253.dist-info/RECORD,,