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

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

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

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

@@ -434,14 +434,12 @@ class SnowflakeViewParts(BaseModel):
         """
         ctes = [self.main_part.cte_text(original_name=True)] + [part.cte_text(original_name=True) for part in self.joined_parts]
         all_ctes = "\n,".join(ctes)
-        direct_columns = self.main_part.direct_columns()
-        join_columns = self.main_part.join_columns()
-        direct_column_clauses = [f"\"{self.main_part.stream_name}\"."+c.original_to_transformed() for c in direct_columns]
-        join_column_clauses = [c.definition() for c in join_columns]
-        # the joined columns may reference the direct columns, so we need to order them correctly
-        final_column_clauses = direct_column_clauses + join_column_clauses
+        main_columns = SnowflakeViewColumn.order_by_reference([c for c in self.main_part.columns if not c.is_join_column])
+        column_clauses = [c.definition() if c.is_join_column 
+                          else f"\"{self.main_part.stream_name}\"."+c.original_to_transformed()
+                          for c in main_columns]        
         view_body = f"""with {all_ctes}
-    select {', '.join(final_column_clauses)}
+    select {', '.join(column_clauses)}
     from "{self.main_part.stream_name}" """
         if len(self.main_part.joins) > 0:
             join_clauses = [join.definition() for join in self.main_part.joins]