omnata-plugin-runtime 0.10.7a249__tar.gz → 0.10.7a251__tar.gz

{omnata_plugin_runtime-0.10.7a249 → omnata_plugin_runtime-0.10.7a251}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.7a249
+Version: 0.10.7a251
 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.7a249 → omnata_plugin_runtime-0.10.7a251}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.10.7-a249"
+version = "0.10.7-a251"
 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.7a249 → omnata_plugin_runtime-0.10.7a251}/src/omnata_plugin_runtime/json_schema.py

@@ -252,14 +252,20 @@ class SnowflakeViewColumn(BaseModel):
         # Collect columns to be moved
         columns_to_move:List[Self] = []
         # Collect Omnata System columns and keep them at the front
-        omnata_system_columns = []
+        omnata_system_columns_start = []
+        omnata_system_columns_end = []
         for column in join_columns[:]:
-            if column.original_name.startswith("OMNATA_"):
+            if column.original_name=="OMNATA_APP_IDENTIFIER":
                 join_columns.remove(column)
-                omnata_system_columns.append(column)
+                omnata_system_columns_start.append(column)
+            elif column.original_name.startswith("OMNATA_"):
+                join_columns.remove(column)
+                omnata_system_columns_end.append(column)
 
         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)
@@ -268,7 +274,7 @@ class SnowflakeViewColumn(BaseModel):
         for column in columns_to_move:
             join_columns.remove(column)
             join_columns.insert(0, column)
-        return omnata_system_columns + join_columns
+        return omnata_system_columns_start + join_columns + omnata_system_columns_end
 
 
 class SnowflakeViewJoin(BaseModel):
@@ -450,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]
         
@@ -671,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,