mtsql 1.12.24__py3-none-any.whl → 1.12.26__py3-none-any.whl

mt/sql/base.py

@@ -6,6 +6,7 @@ import sqlalchemy as sa
 import sqlalchemy.exc as se
 import psycopg as ps
 import ssl
+import time
 
 from mt import tp, logg, pd, ctx, halo
 
@@ -77,12 +78,16 @@ def run_func(
             se.PendingRollbackError,
             ssl.SSLEOFError,
             ssl.SSLZeroReturnError,
-        ):
+        ) as e:
             if x < nb_trials - 1:
                 if logger:
                     msg = f"Ignored an exception raised by failed attempt {x+1}/{nb_trials} to execute `{func.__module__}.{func.__name__}()`"
                     with logger.scoped_warn(msg):
                         logger.warn_last_exception()
+                if isinstance(e, se.PendingRollbackError):
+                    time.sleep(60)
+                elif isinstance(e, ssl.SSLEOFError):
+                    time.sleep(3)
             else:
                 msg = f"Attempted {nb_trials} times to execute `{func.__module__}.{func.__name__}` but failed."
                 logg.error(msg, logger=logger)

mt/sql/psql.py

@@ -640,7 +640,7 @@ def rename_table(
     nb_trials: int = 3,
     logger: tp.Optional[logg.IndentedLoggerAdapter] = None,
 ):
-    """Renames a table of a schema.
+    """Renames a (foreign) table of a schema.
 
     Parameters
     ----------
@@ -653,7 +653,7 @@ def rename_table(
     schema : str or None
         a valid schema name returned from `list_schemas()`
     foreign : bool
-        whether the table to rename to is a foreign table
+        whether the table to rename is a foreign table
     nb_trials : int
         number of query trials
     logger : mt.logg.IndentedLoggerAdapter, optional
@@ -717,21 +717,24 @@ def drop_table(
     table_name,
     engine,
     schema: tp.Optional[str] = None,
-    restrict=True,
+    foreign: bool = False,
+    restrict: bool = True,
     nb_trials: int = 3,
     logger: tp.Optional[logg.IndentedLoggerAdapter] = None,
 ):
-    """Drops a table if it exists, with restrict or cascade options.
+    """Drops a (foreign) table if it exists, with restrict or cascade options.
 
     Parameters
     ----------
     table_name : str
         table name
-    engine: sqlalchemy.engine.Engine
+    engine : sqlalchemy.engine.Engine
         an sqlalchemy connection engine created by function `create_engine()`
-    schema: str or None
+    schema : str or None
         a valid schema name returned from `list_schemas()`
-    restrict: bool
+    foreign : bool
+        whether the table to drop is a foreign table
+    restrict : bool
         If True, refuses to drop table if there is any object depending on it. Otherwise it is the
         'cascade' option which allows you to remove those dependent objects together with the table
         automatically.
@@ -745,9 +748,11 @@ def drop_table(
     whatever exec_sql() returns
     """
     frame_sql_str = frame_sql(table_name, schema=schema)
-    query_str = "DROP TABLE IF EXISTS {} {};".format(
-        frame_sql_str, "RESTRICT" if restrict else "CASCADE"
-    )
+    if foreign:
+        query_str = "DROP FOREIGN TABLE "
+    else:
+        query_str = "DROP TABLE "
+    query_str += f'IF EXISTS {frame_sql_str} {"RESTRICT" if restrict else "CASCADE"};'
     return exec_sql(query_str, engine, nb_trials=nb_trials, logger=logger)
 
 

mt/sql/version.py

@@ -1,5 +1,5 @@
 MAJOR_VERSION = 1
 MINOR_VERSION = 12
-PATCH_VERSION = 24
+PATCH_VERSION = 26
 version = '{}.{}.{}'.format(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
 __all__  = ['MAJOR_VERSION', 'MINOR_VERSION', 'PATCH_VERSION', 'version']

{mtsql-1.12.24.dist-info → mtsql-1.12.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mtsql
-Version: 1.12.24
+Version: 1.12.26
 Summary: Extra Python modules to deal with the interaction between pandas dataframes and remote SQL servers, for Minh-Tri Pham
 Home-page: https://github.com/inteplus/mtsql
 Author: ['Minh-Tri Pham']

{mtsql-1.12.24.dist-info → mtsql-1.12.26.dist-info}/RECORD

@@ -1,17 +1,17 @@
 mt/sql/__init__.py,sha256=b7zO50apZxt9Hg2eOkJhRLrXgACR8eS5b-Rphdn5qNQ,44
-mt/sql/base.py,sha256=j2fzeGUdh-TnvgotuWOmTM-A0pqBg31z2c19bH5E_xk,13504
+mt/sql/base.py,sha256=KnvqVa97Iw69-t1azX_ObjEXiZn3eMsKvTQn-yV7iPM,13702
 mt/sql/mysql.py,sha256=n2ENDctdUqZuSaDAcrqZYtPtawq3Wx4dOPCRsCB5Q4w,4894
-mt/sql/psql.py,sha256=FSsWCej1zoYHtTkW3zG2KgcYvr7nNGLb8tK0IbGyckQ,66915
+mt/sql/psql.py,sha256=8gWsF6ZobwkAxHsfecF95Em_cAlMitHHdQzinZLCi6s,67110
 mt/sql/sqlite.py,sha256=T2ak_hhNi_zRfpg_gp8JhNHn7D2kl4i-Ey6-9ANMtz0,8678
-mt/sql/version.py,sha256=72gvcsidDjkfqwriayY0JSOjweNCSpGWzCnmf_B90Dc,208
+mt/sql/version.py,sha256=7H6Be4Lf31DCXBrPsrhgH2aZx8WIvPlTMAIIKab7Vik,208
 mt/sql/redshift/__init__.py,sha256=S-eRxJWcrvncF7LZXuulCdPV-UERu9eiw6uyDb5aGsM,443
 mt/sql/redshift/commands.py,sha256=xhGUBf3bL66EYdZI5HCUtOx-XqPCnXT_P-LnhPgtzrY,40193
 mt/sql/redshift/ddl.py,sha256=eUcZj9oIajiE1wKKBAP-V64gYJ7cVnSAt8dLFfluOJA,9777
 mt/sql/redshift/dialect.py,sha256=-0JjJubZZHRw0abhl6H6rKWaUE9pKtGwAuX-62T0e_c,53399
 mt/sql/redshift/main.py,sha256=H8_5sjtJ7dzWoCMXzPNjYhrMQ18eLUQ9xg-aYl5QeTc,17104
 mt/sql/redshift/redshift-ca-bundle.crt,sha256=532qYkOpQOstFE0mdXE1GVtL3v00XDKgZNTr6gK5-KE,8621
-mtsql-1.12.24.dist-info/licenses/LICENSE,sha256=PojkRlQzTT5Eg6Nj03XoIVEefN3u8iiIFf1p4rqe_t4,1070
-mtsql-1.12.24.dist-info/METADATA,sha256=wCqtyccICAKaTXRyjG3vCx8kUolNCMcJMsGxxJ5pH80,740
-mtsql-1.12.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mtsql-1.12.24.dist-info/top_level.txt,sha256=WcqGFu9cV7iMZg09iam8eNxUvGpLSKKF2Iubf6SJVOo,3
-mtsql-1.12.24.dist-info/RECORD,,
+mtsql-1.12.26.dist-info/licenses/LICENSE,sha256=PojkRlQzTT5Eg6Nj03XoIVEefN3u8iiIFf1p4rqe_t4,1070
+mtsql-1.12.26.dist-info/METADATA,sha256=D4MnXyMYGf2Oei5QSgCte55ETTzk_uPxC8mw70R1PTA,740
+mtsql-1.12.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mtsql-1.12.26.dist-info/top_level.txt,sha256=WcqGFu9cV7iMZg09iam8eNxUvGpLSKKF2Iubf6SJVOo,3
+mtsql-1.12.26.dist-info/RECORD,,