mtsql 1.12.33__py3-none-any.whl → 1.12.35__py3-none-any.whl

mt/sql/base.py

@@ -299,6 +299,36 @@ def exec_sql(
     )
 
 
+# ----- functions dealing with id tuples -----
+
+
+def id_tuple2sql(a_ids: list, int_type: str = "int") -> str:
+    """Converts an id tuple list into an SQL string representing the tuple list.
+
+    Parameters
+    ----------
+    a_ids : list
+        list of fixed-sized arrays of ids
+    int_type : str
+        an SQL string representing the int type
+
+    Returns
+    -------
+    str
+        SQL string representing the tuple list
+    """
+    n = len(a_ids)
+    if n < 2:
+        raise ValueError("a_ids must have at least 2 elements")
+
+    if int_type == "bigint":
+        values = ",".join((str(x) for x in a_ids))
+    else:
+        values = ",".join((str(int(x)) for x in a_ids))
+
+    return f"({values})"
+
+
 # ----- functions navigating the database -----
 
 
@@ -659,7 +689,7 @@ def find_common_ids(
 
 def find_common_id_tuples(
     la_ids: tp.List[tp.List[int]],
-    id_cols: tp.List[str],
+    l_idCols: tp.List[str],
     frame_name: str,
     engine: sa.engine.Engine,
     schema: tp.Optional[str] = None,
@@ -672,7 +702,7 @@ def find_common_id_tuples(
     ----------
     la_ids : list of list of int
         list of id tuples to be checked
-    id_cols : list of str
+    l_idCols : list of str
         name of the id columns in the frame
     frame_name : str
         name of the frame to be checked against
@@ -680,7 +710,7 @@ def find_common_id_tuples(
         connection engine to the server
     schema : str, optional
         schema of the frame. If None, the default schema is used.
-    id_cols : list of str
+    l_idCols : list of str
         name of the id column in the frame
     int_type : str
         an SQL string representing the int type of the id column
@@ -689,26 +719,30 @@ def find_common_id_tuples(
 
     Returns
     -------
-    list of int
-        list of common ids
+    list of list of int
+        list of cpommon id tuples
     """
 
     with conn_ctx(engine) as conn:
-        temp_table = create_temp_id_table(l_ids, conn, int_type=int_type, logger=logger)
+        temp_table = create_temp_id_tuple_table(
+            la_ids, conn, int_type=int_type, logger=logger
+        )
 
         full_frame_name = frame_sql(frame_name, schema=schema)
 
-        sql = f"""
-        SELECT t.id FROM {temp_table} AS t
-        INNER JOIN {full_frame_name} AS f
-        ON t.id = f.{id_col};
-        """
+        sql = "SELECT t.id1"
+        for i in range(1, len(l_idCols)):
+            sql += f", t.id{i+1}"
+        sql += f" FROM {temp_table} AS t INNER JOIN {full_frame_name} AS f ON "
+        sql += " AND ".join(
+            (f"t.id{i+1} = f.{l_idCols[i]}" for i in range(len(l_idCols)))
+        )
+        sql += ";"
 
         df_common = read_sql(sql, conn, index_col=None, logger=logger)
+        la_commonIds = df_common.to_numpy()
 
-        l_commonIds = df_common["id"].tolist()
-
-    return l_commonIds
+    return la_commonIds
 
 
 def find_common_str_ids(

mt/sql/version.py

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

{mtsql-1.12.33.dist-info → mtsql-1.12.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mtsql
-Version: 1.12.33
+Version: 1.12.35
 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.33.dist-info → mtsql-1.12.35.dist-info}/RECORD

@@ -1,17 +1,17 @@
 mt/sql/__init__.py,sha256=b7zO50apZxt9Hg2eOkJhRLrXgACR8eS5b-Rphdn5qNQ,44
-mt/sql/base.py,sha256=HJzMlKO-SX3aLTMnOrvhrInfNi9O7WMD3tuV2yZIdJg,23863
+mt/sql/base.py,sha256=zbWafsfTW6mw8yH1Ox3_j9virsSt3ZGO6-dp0HUqjTA,24787
 mt/sql/mysql.py,sha256=n2ENDctdUqZuSaDAcrqZYtPtawq3Wx4dOPCRsCB5Q4w,4894
 mt/sql/psql.py,sha256=U8XEyg4rQYr5gm8KohRWrpCNJKl5WC1yxJMBkkm1k_A,68125
 mt/sql/sqlite.py,sha256=T2ak_hhNi_zRfpg_gp8JhNHn7D2kl4i-Ey6-9ANMtz0,8678
-mt/sql/version.py,sha256=3roEiAIfAeKb5dA-3ZmquKI_ZMs8TFD5x-PCcvQBLe4,208
+mt/sql/version.py,sha256=l6eatYcFZJwHDnQ4NVgwoM_k0RqJb1HHDVUPp9Jer68,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.33.dist-info/licenses/LICENSE,sha256=PojkRlQzTT5Eg6Nj03XoIVEefN3u8iiIFf1p4rqe_t4,1070
-mtsql-1.12.33.dist-info/METADATA,sha256=MEQHkGnmBIr4lwNZrMKlCCbUNUOmprFJXE3a0xt5Slg,736
-mtsql-1.12.33.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-mtsql-1.12.33.dist-info/top_level.txt,sha256=WcqGFu9cV7iMZg09iam8eNxUvGpLSKKF2Iubf6SJVOo,3
-mtsql-1.12.33.dist-info/RECORD,,
+mtsql-1.12.35.dist-info/licenses/LICENSE,sha256=PojkRlQzTT5Eg6Nj03XoIVEefN3u8iiIFf1p4rqe_t4,1070
+mtsql-1.12.35.dist-info/METADATA,sha256=IMATsEFAIbflVvIYBi9yNq93vfvXpGZUbgz7k_FIx6Q,736
+mtsql-1.12.35.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mtsql-1.12.35.dist-info/top_level.txt,sha256=WcqGFu9cV7iMZg09iam8eNxUvGpLSKKF2Iubf6SJVOo,3
+mtsql-1.12.35.dist-info/RECORD,,