omnata-plugin-runtime 0.10.6a238__tar.gz → 0.10.6a241__tar.gz

{omnata_plugin_runtime-0.10.6a238 → omnata_plugin_runtime-0.10.6a241}/PKG-INFO

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

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

@@ -254,10 +254,15 @@ class SnowflakeViewColumn(BaseModel):
         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}"')
                     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:
@@ -371,7 +376,7 @@ class SnowflakeViewPart(BaseModel):
         """
         Returns the columns that are not sourced from joins.
         """
-        return [c for c in self.columns if not c.is_join_column]
+        return SnowflakeViewColumn.order_by_reference([c for c in self.columns if not c.is_join_column])
 
     def join_columns(self) -> List[SnowflakeViewColumn]:
         """