mtsql 1.11.12__py3-none-any.whl → 1.11.14__py3-none-any.whl

mt/sql/base.py

@@ -4,7 +4,7 @@ import re
 import uuid
 import sqlalchemy as sa
 import sqlalchemy.exc as se
-import psycopg2 as ps
+import psycopg as ps
 
 from mt import tp, logg, pd, ctx
 from mt.halo import Halo

mt/sql/psql.py

@@ -2,7 +2,7 @@
 
 import sqlalchemy as sa
 import re
-import psycopg2 as ps
+import psycopg as ps
 import sqlalchemy.exc as se
 from tqdm.auto import tqdm  # nice progress bar
 
@@ -1378,12 +1378,16 @@ def comparesync_table(
     """
     frame_sql_str = frame_sql(table_name, schema=schema)
 
-    with logger.scoped_debug(
-        "Comparing table: local '{}' <-> remote '{}'".format(
-            df_filepath, frame_sql_str
-        ),
-        curly=False,
-    ) if logger else ctx.nullcontext():
+    with (
+        logger.scoped_debug(
+            "Comparing table: local '{}' <-> remote '{}'".format(
+                df_filepath, frame_sql_str
+            ),
+            curly=False,
+        )
+        if logger
+        else ctx.nullcontext()
+    ):
         # make sure the folder containing the CSV file exists
         data_dir = path.dirname(df_filepath)
         path.make_dirs(data_dir)
@@ -1448,9 +1452,11 @@ def comparesync_table(
                     id_name, text, hash_name, frame_sql_str
                 )
 
-            with logger.scoped_debug(
-                "Range of '{}'".format(id_name), curly=False
-            ) if logger else ctx.nullcontext():
+            with (
+                logger.scoped_debug("Range of '{}'".format(id_name), curly=False)
+                if logger
+                else ctx.nullcontext()
+            ):
                 qsql = "SELECT min({}) AS val FROM ({}) ct_t0".format(
                     id_name, query_str
                 )
@@ -1656,10 +1662,16 @@ def writesync_table(
                 )
             engine_ro = conn_ro
     frame_sql_str = frame_sql(table_name, schema=schema)
-    with logger.scoped_debug(
-        "Writing table: local '{}' -> remote '{}'".format(df_filepath, frame_sql_str),
-        curly=False,
-    ) if logger else ctx.nullcontext():
+    with (
+        logger.scoped_debug(
+            "Writing table: local '{}' -> remote '{}'".format(
+                df_filepath, frame_sql_str
+            ),
+            curly=False,
+        )
+        if logger
+        else ctx.nullcontext()
+    ):
         (
             local_df,
             remote_md5_df,
@@ -1899,10 +1911,16 @@ def readsync_table(
         file. If no background thread is needed, None is returned.
     """
     frame_sql_str = frame_sql(table_name, schema=schema)
-    with logger.scoped_debug(
-        "Reading table: local '{}' <- remote '{}'".format(df_filepath, frame_sql_str),
-        curly=False,
-    ) if logger else ctx.nullcontext():
+    with (
+        logger.scoped_debug(
+            "Reading table: local '{}' <- remote '{}'".format(
+                df_filepath, frame_sql_str
+            ),
+            curly=False,
+        )
+        if logger
+        else ctx.nullcontext()
+    ):
         (
             local_df,
             remote_md5_df,

mt/sql/redshift/__init__.py

@@ -0,0 +1,17 @@
+from .main import *
+
+__api__ = [
+    "rename_schema",
+    "get_frame_length",
+    "rename_table",
+    "vacuum_table",
+    "drop_table",
+    "rename_view",
+    "drop_view",
+    "rename_matview",
+    "refresh_matview",
+    "drop_matview",
+    "rename_column",
+    "drop_column",
+    "conform",
+]

mt/sql/{redshift.py → redshift/main.py}

@@ -4,25 +4,8 @@ import sqlalchemy as sa
 from mt import tp, np, pd, logg
 from mt.base import LogicError
 
-from .base import *
-from .psql import compliance_check
-
-
-__api__ = [
-    "rename_schema",
-    "get_frame_length",
-    "rename_table",
-    "vacuum_table",
-    "drop_table",
-    "rename_view",
-    "drop_view",
-    "rename_matview",
-    "refresh_matview",
-    "drop_matview",
-    "rename_column",
-    "drop_column",
-    "conform",
-]
+from ..base import *
+from ..psql import compliance_check
 
 
 # ----- simple functions -----

mt/sql/version.py

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

{mtsql-1.11.12.dist-info → mtsql-1.11.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: mtsql
-Version: 1.11.12
+Version: 1.11.14
 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']
@@ -10,7 +10,11 @@ License-File: LICENSE
 Requires-Dist: sqlalchemy
 Requires-Dist: tzlocal
 Requires-Dist: tqdm
-Requires-Dist: psycopg2-binary
-Requires-Dist: mtbase >=4.27.4
-Requires-Dist: mtpandas >=1.15
-
+Requires-Dist: psycopg[binary]
+Requires-Dist: mtbase>=4.27.4
+Requires-Dist: mtpandas>=1.15
+Dynamic: author
+Dynamic: home-page
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: summary

mtsql-1.11.14.dist-info/RECORD

@@ -0,0 +1,13 @@
+mt/sql/__init__.py,sha256=b7zO50apZxt9Hg2eOkJhRLrXgACR8eS5b-Rphdn5qNQ,44
+mt/sql/base.py,sha256=9aTVudlH9_HEq_v7uHV6p6asDuxMidQwAlCRSXDofvY,11967
+mt/sql/mysql.py,sha256=n2ENDctdUqZuSaDAcrqZYtPtawq3Wx4dOPCRsCB5Q4w,4894
+mt/sql/psql.py,sha256=AmXdDVRbvzK7hWK8kysrdiXkAUwSdWmh_OqlWdoNOig,66578
+mt/sql/sqlite.py,sha256=T2ak_hhNi_zRfpg_gp8JhNHn7D2kl4i-Ey6-9ANMtz0,8678
+mt/sql/version.py,sha256=J99AaumZyZLQUlKdA0VgUGPN56i_RovBX1bCTiFWKhI,208
+mt/sql/redshift/__init__.py,sha256=CtVlNj4BfURLrDzeZyaG4vybAVbMkm_scCe1zTZkpDw,294
+mt/sql/redshift/main.py,sha256=6dwnwNJ1F0_V9o2oqrSOkyN_pAMrgE01CCoqAjoyOME,17116
+mtsql-1.11.14.dist-info/LICENSE,sha256=PojkRlQzTT5Eg6Nj03XoIVEefN3u8iiIFf1p4rqe_t4,1070
+mtsql-1.11.14.dist-info/METADATA,sha256=R1Qk8sEpSdGasf4hXd1dVVxbiSS1J7eaG7MjIOXO6BM,673
+mtsql-1.11.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mtsql-1.11.14.dist-info/top_level.txt,sha256=WcqGFu9cV7iMZg09iam8eNxUvGpLSKKF2Iubf6SJVOo,3
+mtsql-1.11.14.dist-info/RECORD,,

{mtsql-1.11.12.dist-info → mtsql-1.11.14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

mtsql-1.11.12.dist-info/RECORD

@@ -1,12 +0,0 @@
-mt/sql/__init__.py,sha256=b7zO50apZxt9Hg2eOkJhRLrXgACR8eS5b-Rphdn5qNQ,44
-mt/sql/base.py,sha256=qR9ggHU7ae_c3Zj6bm6feFe8EQymGjwAw9rQZ_j0GOo,11968
-mt/sql/mysql.py,sha256=n2ENDctdUqZuSaDAcrqZYtPtawq3Wx4dOPCRsCB5Q4w,4894
-mt/sql/psql.py,sha256=tzsIN2XyBJX8t7p0D2yXgEQwUTkTcDzllI4HunCfq3s,66345
-mt/sql/redshift.py,sha256=Xtxy4pmqVfiXARGNOmq2dEG9eRLmaINRJIXvctLIJHg,17389
-mt/sql/sqlite.py,sha256=T2ak_hhNi_zRfpg_gp8JhNHn7D2kl4i-Ey6-9ANMtz0,8678
-mt/sql/version.py,sha256=pqOt4EFHe69mP9LpnUwSE536jna7oEvyHugaySEaxx0,208
-mtsql-1.11.12.dist-info/LICENSE,sha256=PojkRlQzTT5Eg6Nj03XoIVEefN3u8iiIFf1p4rqe_t4,1070
-mtsql-1.11.12.dist-info/METADATA,sha256=QeUuCizrVY8r3CPnD4gXPzQbGdyU-T3pds_LZYqM37o,580
-mtsql-1.11.12.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-mtsql-1.11.12.dist-info/top_level.txt,sha256=WcqGFu9cV7iMZg09iam8eNxUvGpLSKKF2Iubf6SJVOo,3
-mtsql-1.11.12.dist-info/RECORD,,