rda-python-common 3.0.0__py3-none-any.whl → 3.0.1__py3-none-any.whl

rda_python_common/PgDBI.py

@@ -328,8 +328,12 @@ def starttran():
       pgconnect(0, 0, False)
    else:
       try:
-         pgdb.isolation_level
-      except PgSQL.OperationalError as e:
+         # Liveness probe: psycopg2's isolation_level getter could raise on a
+         # dead connection, but psycopg3's is a cached attribute that never
+         # touches the server.  A trivial round-trip detects a broken
+         # connection under either driver.
+         pgdb.cursor().execute("SELECT 1")
+      except PgSQL.Error as e:
          pgconnect(0, 0, False)
       if pgdb.closed:
          pgconnect(0, 0, False)

rda_python_common/pg_dbi.py

@@ -410,8 +410,12 @@ class PgDBI(PgLOG):
          self.pgconnect(0, 0, False)
       else:
          try:
-            self.pgdb.isolation_level
-         except PgSQL.OperationalError as e:
+            # Liveness probe: psycopg2's isolation_level getter could raise on a
+            # dead connection, but psycopg3's is a cached attribute that never
+            # touches the server.  A trivial round-trip detects a broken
+            # connection under either driver.
+            self.pgdb.cursor().execute("SELECT 1")
+         except PgSQL.Error as e:
             self.pgconnect(0, 0, False)
          if self.pgdb.closed:
             self.pgconnect(0, 0, False)
@@ -533,7 +537,11 @@ class PgDBI(PgLOG):
          dberror (str): Full database error string to inspect.
          logact (int): Logging action flags forwarded to add_new_table().
       """
-      ms = re.match(r'^42P01 ERROR:  relation "(.+)" does not exist', dberror)
+      # The caller (check_dberror) only invokes this after pgcode == '42P01', so
+      # match just the relation message.  psycopg2's pgerror includes the
+      # 'ERROR:  ' severity prefix while psycopg3's message_primary does not, so
+      # anchoring on that prefix only matched under psycopg2.
+      ms = re.search(r'relation "(.+)" does not exist', dberror)
       if ms:
          tname = ms.group(1)
          self.add_new_table(tname, logact = logact)

{rda_python_common-3.0.0.dist-info → rda_python_common-3.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.0
+Version: 3.0.1
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common

{rda_python_common-3.0.0.dist-info → rda_python_common-3.0.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rda_python_common/PgCMD.py,sha256=EYjG2Z4zEnvsXE1z-jt5UaNoEKxnOYYiMMzvW6HrKA4,20597
-rda_python_common/PgDBI.py,sha256=PEpZ5DyUuLf-xtdtXdovKxdrNAMkCTHXXH7BUyosp9M,78129
+rda_python_common/PgDBI.py,sha256=e8skOqqIOPQ3_O33b-LFTVfnHRZYe6hYoS8-MoQJF6E,78398
 rda_python_common/PgFile.py,sha256=y_Gxi-54cyb1jpJRKNl3OlOm8I3WG7JuvgANWJ7PDE8,99372
 rda_python_common/PgLOG.py,sha256=l6PXrgCPZ_tmYKSEufoHfWBfCBzVuwcHXpbk3aYA7_w,55892
 rda_python_common/PgLock.py,sha256=12i84nsGBuifSyPnm8IR63LvHvRuVU573D5QKFlHdOI,22623
@@ -9,7 +9,7 @@ rda_python_common/PgSplit.py,sha256=SSg5_Qu5PqP44EkqebO-V_cErNcdE2QtORgFHQ7RqlQ,
 rda_python_common/PgUtil.py,sha256=OqESKCd72b9g8m8jwjPJhXDtPYlW6G8oSOhwChvz2Cg,48600
 rda_python_common/__init__.py,sha256=WTpasPcnTQMDxRbPXv6vTbQQv8bITdUSkZ_RfdyBtig,994
 rda_python_common/pg_cmd.py,sha256=PiQaAeb7l92LceqMwSzLpz9nD5pDRHJcEZxTDn-HeCs,33255
-rda_python_common/pg_dbi.py,sha256=DxteZzGLbyvM4yNWkWibv9QYaNheMNv4ybs01bVgoiQ,118959
+rda_python_common/pg_dbi.py,sha256=73DAROFqQF1HDAVCX7t92gRrOnIFyGLpe8RPYLWDVgo,119524
 rda_python_common/pg_file.py,sha256=nwu1DTD6Pgi4yUFt_IJwvYvMbVMW1eEIf1N5EZjM1o8,162232
 rda_python_common/pg_lock.py,sha256=31EaVDjCkcx3-n8-KnzG18R8Pz7Z6KyFsEqcml6Iq5c,32702
 rda_python_common/pg_log.py,sha256=lzhjEL7FaGjHfl4cmlMuIZVAb5x0fSgiI8AShe0sAHw,82146
@@ -20,9 +20,9 @@ rda_python_common/pg_split.py,sha256=aAWKUZPmZ-LQ_fJ3DSKzPKxJw0fMDJ2fgP8ZT629M30
 rda_python_common/pg_util.py,sha256=3_-baqCI9j5bkC2Uw3hRJZtYwdr0FQC6mtgbeIhLwyQ,86045
 rda_python_common/pgpassword.py,sha256=aTQaO59QokWrv2EKom4TvKhNW2Mr6aFMMBVG4DCbcKI,5023
 rda_python_common/pgpassword.usg,sha256=Wrle6A8sdlMGx3ZEAmE6TNDPOlG84Whe0T3rCNFzPfY,2013
-rda_python_common-3.0.0.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-3.0.0.dist-info/METADATA,sha256=Gy2zqPkeWIe7dXTjv-sz62JbAXSCJGOyJM1HKjVS0hA,14528
-rda_python_common-3.0.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-rda_python_common-3.0.0.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
-rda_python_common-3.0.0.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-3.0.0.dist-info/RECORD,,
+rda_python_common-3.0.1.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-3.0.1.dist-info/METADATA,sha256=9XS840t2_gpk-_vLq7tBcvuJReVMm6uj7eap97iBxgw,14528
+rda_python_common-3.0.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+rda_python_common-3.0.1.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
+rda_python_common-3.0.1.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-3.0.1.dist-info/RECORD,,