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

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

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

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

@@ -242,7 +242,7 @@ class SnowflakeViewColumn(BaseModel):
         )
     
     @classmethod
-    def order_by_reference(cls,join_columns:List[Self]) -> List[Self]:
+    def order_by_reference(cls,columns:List[Self]) -> List[Self]:
         """
         In some situations, column expressions may reference the alias of another column
         This is allowed in Snowflake, as long as the aliased column is defined before it's used in a later column
@@ -253,17 +253,13 @@ class SnowflakeViewColumn(BaseModel):
         columns_to_move:List[Self] = []
         # Collect Omnata System columns and keep them at the front
         omnata_system_columns_start = []
-        omnata_system_columns_end = []
-        for column in join_columns[:]:
-            if column.original_name=="OMNATA_APP_IDENTIFIER":
-                join_columns.remove(column)
+        for column in columns[:]:
+            if column.original_name.startswith("OMNATA_"):
+                columns.remove(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:
+        for column in columns:
+            for other_column in columns:
                 if column==other_column:
                     continue
                 if f'"{column.original_name}"' in other_column.expression:
@@ -272,9 +268,9 @@ class SnowflakeViewColumn(BaseModel):
         
         # Move collected columns to the front
         for column in columns_to_move:
-            join_columns.remove(column)
-            join_columns.insert(0, column)
-        return omnata_system_columns_start + join_columns + omnata_system_columns_end
+            columns.remove(column)
+            columns.insert(0, column)
+        return omnata_system_columns_start + columns
 
 
 class SnowflakeViewJoin(BaseModel):
@@ -406,7 +402,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: