informatica-python 1.7.0__tar.gz → 1.7.1__tar.gz

{informatica_python-1.7.0 → informatica_python-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: informatica-python
-Version: 1.7.0
+Version: 1.7.1
 Summary: Convert Informatica PowerCenter workflow XML to Python/PySpark code
 Author: Nick
 License: MIT

{informatica_python-1.7.0 → informatica_python-1.7.1}/informatica_python/__init__.py

@@ -7,7 +7,7 @@ Licensed under the MIT License.
 
 from informatica_python.converter import InformaticaConverter
 
-__version__ = "1.7.0"
+__version__ = "1.7.1"
 __author__ = "Nick"
 __license__ = "MIT"
 __all__ = ["InformaticaConverter"]

{informatica_python-1.7.0 → informatica_python-1.7.1}/informatica_python/generators/helper_gen.py

@@ -1278,6 +1278,9 @@ def _add_update_strategy_functions(lines):
     lines.append("        key_columns = data_cols[:1]")
     lines.append("        logger.warning(f'No key columns specified for update strategy — using first column: {key_columns}')")
     lines.append("")
+    lines.append("    db_type = conn_config.get('type', 'mssql')")
+    lines.append("    ph = '?' if db_type == 'mssql' else '%s'")
+    lines.append("")
     lines.append("    try:")
     lines.append("        cursor = conn.cursor()")
     lines.append("")
@@ -1295,8 +1298,8 @@ def _add_update_strategy_functions(lines):
     lines.append("")
     lines.append("        if len(df_update) > 0:")
     lines.append("            non_key_cols = [c for c in data_cols if c not in key_columns]")
-    lines.append("            set_clause = ', '.join(f'{c} = ?' for c in non_key_cols)")
-    lines.append("            where_clause = ' AND '.join(f'{c} = ?' for c in key_columns)")
+    lines.append("            set_clause = ', '.join(f'{c} = {ph}' for c in non_key_cols)")
+    lines.append("            where_clause = ' AND '.join(f'{c} = {ph}' for c in key_columns)")
     lines.append("            update_sql = f'UPDATE {qualified_table} SET {set_clause} WHERE {where_clause}'")
     lines.append("            logger.info(f'Updating {len(df_update)} rows in {qualified_table}')")
     lines.append("            for _, row in df_update.iterrows():")
@@ -1304,7 +1307,7 @@ def _add_update_strategy_functions(lines):
     lines.append("                cursor.execute(update_sql, values)")
     lines.append("")
     lines.append("        if len(df_delete) > 0:")
-    lines.append("            where_clause = ' AND '.join(f'{c} = ?' for c in key_columns)")
+    lines.append("            where_clause = ' AND '.join(f'{c} = {ph}' for c in key_columns)")
     lines.append("            delete_sql = f'DELETE FROM {qualified_table} WHERE {where_clause}'")
     lines.append("            logger.info(f'Deleting {len(df_delete)} rows from {qualified_table}')")
     lines.append("            for _, row in df_delete.iterrows():")

{informatica_python-1.7.0 → informatica_python-1.7.1}/informatica_python/generators/mapping_gen.py

@@ -253,7 +253,15 @@ def generate_mapping_code(mapping: MappingDef, folder: FolderDef,
     lines.append(f"    start_time = log_mapping_start('{mapping.name}')")
     lines.append("")
 
-    has_persistent_vars = False
+    has_persistent_vars = any(
+        getattr(v, 'is_persistent', 'NO').upper() == 'YES'
+        for v in (mapping.variables or [])
+    )
+    if has_persistent_vars:
+        lines.append("    # Load persistent state for mapping variables")
+        lines.append("    load_persistent_state()")
+        lines.append("")
+
     if mapping.variables:
         lines.append("    # Mapping Variables")
         for var in mapping.variables:
@@ -318,6 +326,14 @@ def generate_mapping_code(mapping: MappingDef, folder: FolderDef,
     for tgt_name, tgt_def in target_map.items():
         _generate_target_write(lines, tgt_name, tgt_def, connector_graph, source_dfs, transform_map, instance_map, session_overrides, validate_casts=validate_casts)
 
+    if has_persistent_vars:
+        lines.append("    # Save persistent mapping variables")
+        for var in mapping.variables:
+            if getattr(var, 'is_persistent', 'NO').upper() == 'YES':
+                safe_var = _safe_name(var.name.replace("$$", ""))
+                lines.append(f"    set_persistent_variable('{mapping.name}', '{safe_var}', {safe_var})")
+        lines.append("    save_persistent_state()")
+
     lines.append("")
     lines.append(f"    log_mapping_end('{mapping.name}', start_time)")
     lines.append(f"    logger.info('Mapping {mapping.name} completed successfully')")
@@ -1230,7 +1246,7 @@ def _gen_stored_proc(lines, tx, tx_safe, input_df, source_dfs):
     lines.append(f"    # Stored Procedure: {proc_name or tx.name}")
 
     if input_params:
-        param_dict_items = ", ".join(f"'{p}': {input_df}['{p}'].iloc[0] if '{p}' in {input_df}.columns else None" for p in input_params)
+        param_dict_items = ", ".join(f"'{p}': {input_df}['{p}'].iloc[0] if '{p}' in {input_df}.columns and len({input_df}) > 0 else None" for p in input_params)
         lines.append(f"    _sp_params_{tx_safe} = {{{param_dict_items}}}")
     else:
         lines.append(f"    _sp_params_{tx_safe} = {{}}")
@@ -1304,6 +1320,8 @@ def _generate_target_write(lines, tgt_name, tgt_def, connector_graph, source_dfs
         target_cols = [f.name for f in tgt_def.fields] if tgt_def.fields else None
         if target_cols:
             lines.append(f"    available_cols = [c for c in {target_cols} if c in df_target_{tgt_safe}.columns]")
+            lines.append(f"    if '_update_strategy' in df_target_{tgt_safe}.columns and '_update_strategy' not in available_cols:")
+            lines.append(f"        available_cols.append('_update_strategy')")
             lines.append(f"    df_target_{tgt_safe} = df_target_{tgt_safe}[available_cols]")
     else:
         lines.append(f"    df_target_{tgt_safe} = {input_df}")

{informatica_python-1.7.0 → informatica_python-1.7.1}/informatica_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: informatica-python
-Version: 1.7.0
+Version: 1.7.1
 Summary: Convert Informatica PowerCenter workflow XML to Python/PySpark code
 Author: Nick
 License: MIT

{informatica_python-1.7.0 → informatica_python-1.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "informatica-python"
-version = "1.7.0"
+version = "1.7.1"
 description = "Convert Informatica PowerCenter workflow XML to Python/PySpark code"
 readme = "README.md"
 license = {text = "MIT"}

{informatica_python-1.7.0 → informatica_python-1.7.1}/tests/test_integration.py

@@ -946,6 +946,31 @@ class TestUpdateStrategy:
         assert "write_to_db" in code
         assert "_update_strategy" in code
 
+    def test_update_strategy_preserved_through_projection(self):
+        from informatica_python.models import TargetDef, FieldDef
+        from informatica_python.generators.mapping_gen import _generate_target_write
+        tgt = TargetDef(name="TGT_DB", database_type="Oracle",
+                        fields=[FieldDef(name="ID", datatype="integer"),
+                                FieldDef(name="VAL", datatype="string")])
+        lines = []
+        source_dfs = {"SRC": "df_src"}
+        from informatica_python.models import ConnectorDef
+        conns = [ConnectorDef(from_instance="SRC", to_instance="TGT_DB",
+                              from_instance_type="", to_instance_type="",
+                              from_field="ID", to_field="ID")]
+        connector_graph = {"to": {"TGT_DB": conns}, "from": {"SRC": conns}}
+        _generate_target_write(lines, "TGT_DB", tgt, connector_graph, source_dfs, {}, {})
+        code = "\n".join(lines)
+        assert "_update_strategy" in code
+        assert "available_cols.append('_update_strategy')" in code
+
+    def test_update_strategy_dialect_aware_placeholders(self):
+        from informatica_python.models import FolderDef
+        from informatica_python.generators.helper_gen import generate_helper_functions
+        folder = FolderDef(name="TestFolder")
+        code = generate_helper_functions(folder)
+        assert "ph = '?' if db_type == 'mssql' else '%s'" in code
+
     def test_update_strategy_helper_generated(self):
         from informatica_python.models import FolderDef
         from informatica_python.generators.helper_gen import generate_helper_functions
@@ -1064,8 +1089,8 @@ class TestStatePersistence:
                                                      default_value="''", is_persistent="NO")])
         folder = FolderDef(name="TestFolder", workflows=[wf])
         code = generate_workflow_code(folder)
-        assert "load_persistent_state" not in code or "import" in code
-        assert "save_persistent_state" not in code or "import" in code
+        assert "load_persistent_state()" not in code
+        assert "save_persistent_state()" not in code
 
     def test_mapping_persistent_variables(self):
         from informatica_python.models import (
@@ -1091,6 +1116,9 @@ class TestStatePersistence:
         code = generate_mapping_code(mapping, folder, "pandas", 1)
         assert "get_persistent_variable('m_persist_test', 'last_id'" in code
         assert "temp = ''" in code
+        assert "load_persistent_state()" in code
+        assert "set_persistent_variable('m_persist_test', 'last_id'" in code
+        assert "save_persistent_state()" in code
 
     def test_workflow_persistent_imports(self):
         from informatica_python.models import FolderDef, WorkflowDef, WorkflowVariable