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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: iris-pgwire
-Version: 1.7.0
+Version: 1.7.2
 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
@@ -57,10 +57,11 @@ Requires-Dist: opentelemetry-instrumentation-asyncio>=0.41b0
 Requires-Dist: opentelemetry-sdk>=1.20.0
 Requires-Dist: prometheus-client>=0.17.0
 Requires-Dist: psycopg2-binary>=2.9.10
-Requires-Dist: pydantic>=2.0.0
+Requires-Dist: pydantic<2.12,>=2.0.0
 Requires-Dist: pyyaml>=6.0.0
 Requires-Dist: sqlparse>=0.4.0
 Requires-Dist: structlog>=23.0.0
+Requires-Dist: typing-extensions<5,>=4.12.2
 Provides-Extra: ai
 Provides-Extra: dev
 Requires-Dist: black>=23.0.0; extra == 'dev'

{iris_pgwire-1.7.0 → iris_pgwire-1.7.2}/pyproject.toml

@@ -63,7 +63,9 @@ dependencies = [
     "opentelemetry-sdk>=1.20.0",
     "opentelemetry-instrumentation-asyncio>=0.41b0",
     "opentelemetry-exporter-otlp>=1.20.0",
-    "pydantic>=2.0.0",
+    # pydantic>=2.12 requires typing_extensions>=4.14.1; IRIS irispython ships 4.12.2
+    "pydantic>=2.0.0,<2.12",
+    "typing_extensions>=4.12.2,<5",
     "pyyaml>=6.0.0",
     "prometheus-client>=0.17.0",
 ]

{iris_pgwire-1.7.0 → iris_pgwire-1.7.2}/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.0"
+__version__ = "1.7.2"
 __author__ = "Thomas Dyar <thomas.dyar@intersystems.com>"
 
 # Don't import server/protocol in __init__ to avoid sys.modules conflicts

{iris_pgwire-1.7.0 → iris_pgwire-1.7.2}/src/iris_pgwire/catalog/functions.py

@@ -491,57 +491,57 @@ JSONB_BUILD_OBJECT6 = CatalogFunction(
 
 JSONB_CONTAINS = CatalogFunction(
     name="JSONB_CONTAINS",
-    signature="leftJson VARCHAR(65535), rightJson VARCHAR(65535)",
+    signature="LEFTJSON VARCHAR(65535), RIGHTJSON VARCHAR(65535)",
     returns="INTEGER",
     purpose="PostgreSQL jsonb @> containment operator — returns 1 if rightJson is contained in leftJson, 0 otherwise",
     body="""{
-  set tResult = 0
-  if (rightJson = "") || (rightJson = "{}") || (rightJson = "[]") { quit 1 }
-  if (leftJson = "") || (leftJson = "null") { quit 0 }
-  set tLeft = "", tRight = ""
-  try {
-    set tLeft = ##class(%DynamicAbstractObject).%FromJSON(leftJson)
-    set tRight = ##class(%DynamicAbstractObject).%FromJSON(rightJson)
-  } catch ex {
-    set tLeft = "", tRight = ""
+  SET TRESULT = 0
+  IF (RIGHTJSON = "") || (RIGHTJSON = "{}") || (RIGHTJSON = "[]") { QUIT 1 }
+  IF (LEFTJSON = "") || ($ZCVT(LEFTJSON,"L") = "null") { QUIT 0 }
+  SET TLEFT = "", TRIGHT = ""
+  TRY {
+    SET TLEFT = ##CLASS(%DynamicAbstractObject).%FromJSON(LEFTJSON)
+    SET TRIGHT = ##CLASS(%DynamicAbstractObject).%FromJSON(RIGHTJSON)
+  } CATCH EX {
+    SET TLEFT = "", TRIGHT = ""
   }
-  if $isobject(tRight) = 0 { quit (tLeft = tRight) }
-  if tRight.%IsA("%DynamicObject") {
-    if $isobject(tLeft) = 0 { quit 0 }
-    if 'tLeft.%IsA("%DynamicObject") { quit 0 }
-    set tResult = 1
-    set tIter = tRight.%GetIterator()
-    while tIter.%GetNext(.tKey, .tRVal) && tResult {
-      set tLVal = tLeft.%Get(tKey)
-      if $isobject(tRVal) {
-        if $isobject(tLVal) = 0 { set tResult = 0  quit }
-        if ##class(PGWire.funcJSONBCONTAINS).JSONBCONTAINS(tLVal.%ToJSON(), tRVal.%ToJSON()) = 0 { set tResult = 0 }
-      } else {
-        if (tLVal '= tRVal) { set tResult = 0 }
+  IF $ISOBJECT(TRIGHT) = 0 { QUIT (TLEFT = TRIGHT) }
+  IF $ZCVT($CLASSNAME(TRIGHT),"U") = "%LIBRARY.DYNAMICOBJECT" {
+    IF $ISOBJECT(TLEFT) = 0 { QUIT 0 }
+    IF $ZCVT($CLASSNAME(TLEFT),"U") '= "%LIBRARY.DYNAMICOBJECT" { QUIT 0 }
+    SET TRESULT = 1
+    SET TITER = TRIGHT.%GetIterator()
+    WHILE TITER.%GetNext(.TKEY, .TRVAL) && TRESULT {
+      SET TLVAL = TLEFT.%Get(TKEY)
+      IF $ISOBJECT(TRVAL) {
+        IF $ISOBJECT(TLVAL) = 0 { SET TRESULT = 0  QUIT }
+        IF ##CLASS(PGWire.funcJSONBCONTAINS).JSONBCONTAINS(TLVAL.%ToJSON(), TRVAL.%ToJSON()) = 0 { SET TRESULT = 0 }
+      } ELSE {
+        IF (TLVAL '= TRVAL) { SET TRESULT = 0 }
       }
     }
-    quit tResult
+    QUIT TRESULT
   }
-  if tRight.%IsA("%DynamicArray") {
-    if $isobject(tLeft) = 0 { quit 0 }
-    if 'tLeft.%IsA("%DynamicArray") { quit 0 }
-    set tResult = 1
-    set tIterR = tRight.%GetIterator()
-    while tIterR.%GetNext(, .tRVal) && tResult {
-      set tFound = 0
-      set tIterL = tLeft.%GetIterator()
-      while tIterL.%GetNext(, .tLVal) {
-        if $isobject(tRVal) && $isobject(tLVal) {
-          if ##class(PGWire.funcJSONBCONTAINS).JSONBCONTAINS(tLVal.%ToJSON(), tRVal.%ToJSON()) { set tFound = 1  quit }
-        } elseif (tLVal = tRVal) {
-          set tFound = 1  quit
+  IF $ZCVT($CLASSNAME(TRIGHT),"U") = "%LIBRARY.DYNAMICARRAY" {
+    IF $ISOBJECT(TLEFT) = 0 { QUIT 0 }
+    IF $ZCVT($CLASSNAME(TLEFT),"U") '= "%LIBRARY.DYNAMICARRAY" { QUIT 0 }
+    SET TRESULT = 1
+    SET TITERR = TRIGHT.%GetIterator()
+    WHILE TITERR.%GetNext(, .TRVAL) && TRESULT {
+      SET TFOUND = 0
+      SET TITERL = TLEFT.%GetIterator()
+      WHILE TITERL.%GetNext(, .TLVAL) {
+        IF $ISOBJECT(TRVAL) && $ISOBJECT(TLVAL) {
+          IF ##CLASS(PGWire.funcJSONBCONTAINS).JSONBCONTAINS(TLVAL.%ToJSON(), TRVAL.%ToJSON()) { SET TFOUND = 1  QUIT }
+        } ELSEIF (TLVAL = TRVAL) {
+          SET TFOUND = 1  QUIT
         }
       }
-      if 'tFound { set tResult = 0 }
+      IF 'TFOUND { SET TRESULT = 0 }
     }
-    quit tResult
+    QUIT TRESULT
   }
-  quit (tLeft = tRight)
+  QUIT (TLEFT = TRIGHT)
 }""",
 )
 

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

@@ -109,6 +109,8 @@ class DdlErrorHandler:
             r"already\s+exists",
             r"Duplicate\s+table\s+name",
             r"Duplicate\s+index\s+name",
+            # IRIS: "Class 'Schema.Table' already has index named 'IdxName'."
+            r"already\s+has\s+index\s+named",
             r"SQLCODE\s*[:\s]\s*<?-?\d+>?",  # IRIS SQLCODEs often indicate duplicates
         ]
         return any(re.search(p, error_msg, re.IGNORECASE) for p in patterns)