omnata-plugin-runtime 0.10.5a234__py3-none-any.whl → 0.10.6a236__py3-none-any.whl

omnata_plugin_runtime/json_schema.py

@@ -154,6 +154,9 @@ class SnowflakeViewColumn(BaseModel):
     In other words, the column definition is "expression as name".
     """
     name: str
+    original_name: str = Field(
+        ..., description="The name of the column before the column naming transformation is applied"
+    )
     expression: str
     comment: Optional[str] = Field(default=None)
     is_join_column: Optional[bool] = Field(
@@ -170,7 +173,13 @@ class SnowflakeViewColumn(BaseModel):
             self.comment,
         )
 
-    def definition(self) -> str:
+    def definition(self,original_name:bool = False) -> str:
+        """
+        Returns the column definition for a normalized view.
+        If original_name is True, the original name will be used instead of the transformed name.
+        """
+        if original_name:
+            return f'{self.expression} as "{self.original_name}"'
         return f'{self.expression} as "{self.name}"'
 
     def name_with_comment(self,binding_list:Optional[List[Any]] = None) -> str:
@@ -222,6 +231,7 @@ class SnowflakeViewColumn(BaseModel):
             required_stream_names = json_schema_property.requiredStreamNames
         return cls(
             name=final_column_name,
+            original_name=column_name,
             expression=expression,
             comment=comment,
             is_join_column=json_schema_property.isJoinColumn,
@@ -383,12 +393,12 @@ class SnowflakeViewPart(BaseModel):
             c.name_with_comment(binding_list) for c in (self.direct_columns() + self.join_columns())
         ]
     
-    def cte_text(self) -> str:
+    def cte_text(self,original_name: bool = False) -> str:
         """
         Returns the CTE text for this view part.
         """
         return f""" "{self.stream_name}" as (
-    select {', '.join([c.definition() for c in self.direct_columns()])} 
+    select {', '.join([c.definition(original_name=original_name) for c in self.direct_columns()])} 
     from {self.raw_table_location.get_fully_qualified_name()}
 ) """
 
@@ -407,14 +417,19 @@ class SnowflakeViewParts(BaseModel):
 
     def view_body(self):
         """
-        Creates a view definition from the parts
+        Creates a view definition from the parts.
+        The view will consist of CTEs for all of the involved streams, and these will use their original column names without transformation.
+        There will be a final SELECT statement that selects all columns from the main stream, and then adds any columns obtained via joins.
+        In the final select statement, the join columns will be aliased with their transformed names.
         """
-        ctes = [self.main_part.cte_text()] + [part.cte_text() for part in self.joined_parts]
+        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()
-        join_column_clauses = [c.definition() for c in join_columns]
-        # we select * from the original view (in the CTE) and then add any expressions that come from the join columns
-        final_column_clauses = [f'"{self.main_part.stream_name}".*'] + join_column_clauses
+        direct_column_clauses = [c.definition(original_name=True) for c in direct_columns]
+        join_column_clauses = [c.definition(original_name=False) 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
         view_body = f"""with {all_ctes}
     select {', '.join(final_column_clauses)}
     from "{self.main_part.stream_name}" """
@@ -584,6 +599,7 @@ def normalized_view_part(
         snowflake_columns.append(
             SnowflakeViewColumn(
                 name="OMNATA_APP_IDENTIFIER",
+                original_name="OMNATA_APP_IDENTIFIER",
                 expression="APP_IDENTIFIER",
                 comment="The value of the unique identifier for the record in the source system",
             )
@@ -591,6 +607,7 @@ def normalized_view_part(
         snowflake_columns.append(
             SnowflakeViewColumn(
                 name="OMNATA_RETRIEVE_DATE",
+                original_name="OMNATA_RETRIEVE_DATE",
                 expression="RETRIEVE_DATE",
                 comment="The date and time the record was retrieved from the source system",
             )
@@ -598,6 +615,7 @@ def normalized_view_part(
         snowflake_columns.append(
             SnowflakeViewColumn(
                 name="OMNATA_RAW_RECORD",
+                original_name="OMNATA_RAW_RECORD",
                 expression="RECORD_DATA",
                 comment="The raw semi-structured record as retrieved from the source system",
             )
@@ -605,6 +623,7 @@ def normalized_view_part(
         snowflake_columns.append(
             SnowflakeViewColumn(
                 name="OMNATA_IS_DELETED",
+                original_name="OMNATA_IS_DELETED",
                 expression="IS_DELETED",
                 comment="A flag to indicate that the record was deleted from the source system",
             )
@@ -612,6 +631,7 @@ def normalized_view_part(
         snowflake_columns.append(
             SnowflakeViewColumn(
                 name="OMNATA_RUN_ID",
+                original_name="OMNATA_RUN_ID",
                 expression="RUN_ID",
                 comment="A flag to indicate which run the record was last processed in",
             )

{omnata_plugin_runtime-0.10.5a234.dist-info → omnata_plugin_runtime-0.10.6a236.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.5a234
+Version: 0.10.6a236
 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.5a234.dist-info → omnata_plugin_runtime-0.10.6a236.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=fpSyBr3Dr7GNdil88915VtMwRy5pexkGCRBk7BLFpPs,46527
 omnata_plugin_runtime/forms.py,sha256=9YHJ_T17lT-rwyDaUg_0yj_YMPda4DRCw_wrvf8hE0E,19964
-omnata_plugin_runtime/json_schema.py,sha256=NujSQBtyfnvSyw13sSFiSKmZeXkSk5cqCDVyuNwOACg,28395
+omnata_plugin_runtime/json_schema.py,sha256=WJ3I7UORtVOLMDgtu6U8ZH7NuZoTGpJ9bFueyshgVjg,29739
 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.5a234.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.10.5a234.dist-info/METADATA,sha256=LsKz7fr8l-ZAnHw1azvxE0TgxN7X-_hov-IwFiZojys,2211
-omnata_plugin_runtime-0.10.5a234.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-omnata_plugin_runtime-0.10.5a234.dist-info/RECORD,,
+omnata_plugin_runtime-0.10.6a236.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.10.6a236.dist-info/METADATA,sha256=YniIppQo7-RJ4lfGmJAWGWMlj--9bQSroXCMPYL7k1U,2211
+omnata_plugin_runtime-0.10.6a236.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+omnata_plugin_runtime-0.10.6a236.dist-info/RECORD,,