iris-pgwire 1.5.6__tar.gz → 1.5.7__tar.gz

{iris_pgwire-1.5.6 → iris_pgwire-1.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris-pgwire
-Version: 1.5.6
+Version: 1.5.7
 Summary: PostgreSQL Wire Protocol Server for InterSystems IRIS - Connect BI tools, Python frameworks, and PostgreSQL clients to IRIS databases
 Project-URL: Homepage, https://github.com/intersystems-community/iris-pgwire
 Project-URL: Documentation, https://github.com/intersystems-community/iris-pgwire#readme

{iris_pgwire-1.5.6 → iris_pgwire-1.5.7}/src/iris_pgwire/__init__.py

@@ -6,7 +6,7 @@ Based on the specification from docs/iris_pgwire_plan.md and proven patterns fro
 caretdev/sqlalchemy-iris.
 """
 
-__version__ = "1.5.6"
+__version__ = "1.5.7"
 __author__ = "Thomas Dyar <thomas.dyar@intersystems.com>"
 
 # Don't import server/protocol in __init__ to avoid sys.modules conflicts

{iris_pgwire-1.5.6 → iris_pgwire-1.5.7}/src/iris_pgwire/iris_executor.py

@@ -696,7 +696,18 @@ class IRISExecutor:
                 columns=plan.columns,
                 session_id=session_id,
             )
-        optimized_sql = plan.stripped_sql
+        # Strip RETURNING / ON CONFLICT from the *translated* optimized_sql.
+        # When original_sql was provided, plan.stripped_sql is the original (untranslated)
+        # SQL with only RETURNING removed — we must NOT use it to overwrite optimized_sql or
+        # we'd undo the entire normalization pipeline (DEFAULT, $1 params, schema names, etc.
+        # still present → IRIS SQLCODE -12).
+        # Instead, apply the same stripping regex directly to optimized_sql.
+        if original_sql:
+            optimized_sql = ReturningPlan._strip_clauses(
+                optimized_sql, plan.returning_clause, plan.on_conflict_clause
+            )
+        else:
+            optimized_sql = plan.stripped_sql
 
         # 6. Semicolon Stripping
         optimized_sql = optimized_sql.strip().rstrip(";")