iris-pgwire 1.7.2__tar.gz → 1.7.3__tar.gz

{iris_pgwire-1.7.2 → iris_pgwire-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: iris-pgwire
-Version: 1.7.2
+Version: 1.7.3
 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.7.2 → iris_pgwire-1.7.3}/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.7.2"
+__version__ = "1.7.3"
 __author__ = "Thomas Dyar <thomas.dyar@intersystems.com>"
 
 # Don't import server/protocol in __init__ to avoid sys.modules conflicts

{iris_pgwire-1.7.2 → iris_pgwire-1.7.3}/src/iris_pgwire/conversions/ddl_idempotency.py

@@ -44,8 +44,11 @@ class DdlErrorHandler:
             DdlResult indicating if the operation succeeded, was skipped, or failed
         """
         error_msg = str(error)
+        # iris.sql.exec raises SQLError with a .sqlcode attribute; -324 is the
+        # IRIS SQLCODE for "already has index named" (not always present in str(e)).
+        sqlcode = getattr(error, "sqlcode", None)
 
-        if self._is_duplicate_error(error_msg):
+        if sqlcode == -324 or self._is_duplicate_error(error_msg):
             if self.has_if_not_exists(sql):
                 obj_name = self.extract_object_name(sql)
                 obj_type = self._extract_object_type(sql)

{iris_pgwire-1.7.2 → iris_pgwire-1.7.3}/src/iris_pgwire/conversions/vector_syntax.py

@@ -65,8 +65,10 @@ class HnswIndexSpec:
         Raises ValueError for unsupported operators (e.g. vector_l2_ops).
         """
         # Form 1: USING hnsw (col ops) [WITH (...)]
+        # (?P<ine>) matches "IF NOT EXISTS" or the /* IF_NOT_EXISTS */ comment marker
+        # that the construct translator inserts before HNSW translation runs.
         form1 = re.search(
-            r"CREATE\s+(?:UNIQUE\s+)?INDEX\s+(?P<ine>IF\s+NOT\s+EXISTS\s+)?"
+            r"CREATE\s+(?:UNIQUE\s+)?INDEX\s+(?P<ine>IF\s+NOT\s+EXISTS|/\*\s*IF_NOT_EXISTS\s*\*/)?\s*"
             r"(?P<name>\w+)\s+ON\s+(?P<table>[\w.]+)\s+"
             r"USING\s+hnsw\s*\(\s*(?P<col>\w+)\s+(?P<op>\w+)\s*\)"
             r"(?:\s+WITH\s*\((?P<with>[^)]*)\))?",
@@ -99,7 +101,7 @@ class HnswIndexSpec:
 
         # Form 2: (col) USING HNSW [WITH (...)]
         form2 = re.search(
-            r"CREATE\s+(?:UNIQUE\s+)?INDEX\s+(?P<ine>IF\s+NOT\s+EXISTS\s+)?"
+            r"CREATE\s+(?:UNIQUE\s+)?INDEX\s+(?P<ine>IF\s+NOT\s+EXISTS|/\*\s*IF_NOT_EXISTS\s*\*/)?\s*"
             r"(?P<name>\w+)\s+ON\s+(?P<table>[\w.]+)\s*"
             r"\(\s*(?P<col>\w+)\s*\)\s+"
             r"USING\s+HNSW"

{iris_pgwire-1.7.2 → iris_pgwire-1.7.3}/src/iris_pgwire/iris_executor.py

@@ -1258,7 +1258,10 @@ class IRISExecutor:
                 # Check both for raised exceptions and for success=False results
                 if not result.get("success", True):
                     error_msg = result.get("error", "")
-                    ddl_result = self.ddl_handler.handle(sql, Exception(error_msg))
+                    # Use original_sql (pre-translation) so DdlErrorHandler can see
+                    # IF NOT EXISTS even when HNSW translation strips the marker.
+                    _sql_for_ddl = kwargs.get("original_sql") or sql
+                    ddl_result = self.ddl_handler.handle(_sql_for_ddl, Exception(error_msg))
                     if ddl_result.success and ddl_result.skipped:
                         logger.info(
                             f"DDL idempotency: skipped '{ddl_result.object_name}' because it already exists",
@@ -1956,6 +1959,7 @@ class IRISExecutor:
         is_embedded: bool = True,
         session_id: str | None = None,
         connection: Any = None,
+        original_sql: str | None = None,
     ) -> Any:
         """Execute SQL with DDL idempotency handling."""
         iris = self._import_iris()
@@ -2030,7 +2034,10 @@ class IRISExecutor:
                             pass
                     raise e
         except Exception as e:
-            result = self.ddl_handler.handle(sql, e)
+            # Use original_sql (pre-translation) so DdlErrorHandler sees IF NOT EXISTS
+            # even when HNSW translation strips the marker from the final SQL.
+            _sql_for_ddl = original_sql or sql
+            result = self.ddl_handler.handle(_sql_for_ddl, e)
             if result.success and result.skipped:
                 return NoopCursor()
             raise e
@@ -2479,7 +2486,8 @@ class IRISExecutor:
                 pass
 
     def _execute_embedded_statement_sequence(
-        self, statements: list[str], params: list | None, session_id: str | None
+        self, statements: list[str], params: list | None, session_id: str | None,
+        original_sql: str | None = None,
     ) -> Any:
         """Execute statement sequence for embedded mode and return the final cursor."""
         if not statements:
@@ -2493,10 +2501,15 @@ class IRISExecutor:
             )
 
         for stmt in statements[:-1]:
-            tmp_result = self._safe_execute(stmt, None, is_embedded=True, session_id=session_id)
+            tmp_result = self._safe_execute(
+                stmt, None, is_embedded=True, session_id=session_id, original_sql=original_sql
+            )
             self._close_cursor_if_possible(tmp_result)
 
-        return self._safe_execute(statements[-1], params, is_embedded=True, session_id=session_id)
+        return self._safe_execute(
+            statements[-1], params, is_embedded=True, session_id=session_id,
+            original_sql=original_sql,
+        )
 
     def _resolve_embedded_returning_result(
         self,
@@ -2733,7 +2746,7 @@ class IRISExecutor:
 
                 statements = self._split_sql_statements(optimized_sql)
                 result = self._execute_embedded_statement_sequence(
-                    statements, optimized_params, session_id
+                    statements, optimized_params, session_id, original_sql=original_sql
                 )
 
                 result = self._resolve_embedded_returning_result(
@@ -3314,7 +3327,8 @@ class IRISExecutor:
                 # Execute all statements except the last
                 for stmt in statements[:-1]:
                     tmp_cursor = self._safe_execute(
-                        stmt, None, is_embedded=False, session_id=session_id, connection=conn
+                        stmt, None, is_embedded=False, session_id=session_id, connection=conn,
+                        original_sql=original_sql,
                     )
                     if tmp_cursor:
                         try:
@@ -3332,6 +3346,7 @@ class IRISExecutor:
                         is_embedded=False,
                         session_id=session_id,
                         connection=conn,
+                        original_sql=original_sql,
                     )
                 except Exception as exc:
                     if plan.conflict_action and self._is_unique_violation(exc):

{iris_pgwire-1.7.2 → iris_pgwire-1.7.3}/src/iris_pgwire/protocol.py

@@ -1389,6 +1389,7 @@ class PGWireProtocol:
                 session_id=self.connection_id,
                 in_transaction=in_txn,
                 autocommit=autocommit,
+                original_sql=translation_result.get("original_sql", query),
             )
 
             # Add translation metadata to result for debugging/monitoring
@@ -1407,7 +1408,12 @@ class PGWireProtocol:
             else:
                 error_msg = result.get("error", "Query execution failed")
                 if (
-                    VectorQueryOptimizer.sql_has_if_not_exists(final_sql)
+                    (
+                        VectorQueryOptimizer.sql_has_if_not_exists(final_sql)
+                        or VectorQueryOptimizer.sql_has_if_not_exists(
+                            translation_result.get("original_sql", "")
+                        )
+                    )
                     and VectorQueryOptimizer.is_duplicate_object_error(error_msg)
                 ):
                     logger.info(

{iris_pgwire-1.7.2 → iris_pgwire-1.7.3}/src/iris_pgwire/sql_translator/mappings/constructs.py

@@ -255,9 +255,10 @@ class IRISSQLConstructRegistry:
 
         # HNSW Index — Form 1: pgvector USING hnsw (col ops) [WITH (...)]
         # Handles schema-qualified table names (schema.table)
+        _HNSW_INE = r"(?:IF\s+NOT\s+EXISTS|/\*\s*IF_NOT_EXISTS\s*\*/)?\s*"
         self.add_construct(
             name="HNSW_INDEX",
-            pattern=r"CREATE\s+(?:UNIQUE\s+)?INDEX\s+(?:IF\s+NOT\s+EXISTS\s+)?\w+\s+ON\s+[\w.]+\s+USING\s+hnsw\s*\([^)]+\)(?:\s+WITH\s*\([^)]*\))?",
+            pattern=r"CREATE\s+(?:UNIQUE\s+)?INDEX\s+" + _HNSW_INE + r"\w+\s+ON\s+[\w.]+\s+USING\s+hnsw\s*\([^)]+\)(?:\s+WITH\s*\([^)]*\))?",
             replacement=None,
             post_process=self._translate_hnsw_index,
             confidence=0.95,
@@ -268,7 +269,7 @@ class IRISSQLConstructRegistry:
         # e.g. CREATE INDEX i ON t (emb) USING HNSW WITH (M=16, Distance='COSINE')
         self.add_construct(
             name="HNSW_INDEX_COL_FIRST",
-            pattern=r"CREATE\s+(?:UNIQUE\s+)?INDEX\s+(?:IF\s+NOT\s+EXISTS\s+)?\w+\s+ON\s+[\w.]+\s*\([^)]+\)\s+USING\s+HNSW(?:\s+WITH\s*\([^)]*\))?",
+            pattern=r"CREATE\s+(?:UNIQUE\s+)?INDEX\s+" + _HNSW_INE + r"\w+\s+ON\s+[\w.]+\s*\([^)]+\)\s+USING\s+HNSW(?:\s+WITH\s*\([^)]*\))?",
             replacement=None,
             post_process=self._translate_hnsw_index,
             confidence=0.95,

{iris_pgwire-1.7.2 → iris_pgwire-1.7.3}/src/iris_pgwire/vector_optimizer.py

@@ -788,7 +788,10 @@ class VectorQueryOptimizer:
     @staticmethod
     def is_duplicate_object_error(error_msg: str) -> bool:
         """Return True if error_msg indicates an object-already-exists SQLCODE."""
-        return any(code in error_msg for code in VectorQueryOptimizer._IRIS_DUPLICATE_CODES)
+        if any(code in error_msg for code in VectorQueryOptimizer._IRIS_DUPLICATE_CODES):
+            return True
+        # IRIS text message for duplicate index (no SQLCODE emitted)
+        return bool(re.search(r"already\s+has\s+index\s+named|already\s+exists", error_msg, re.IGNORECASE))
 
     @staticmethod
     def sql_has_if_not_exists(sql: str) -> bool: