wcp-library 1.2.6__py3-none-any.whl → 1.2.8__py3-none-any.whl

wcp_library/async_sql/oracle.py

@@ -188,7 +188,7 @@ class AsyncOracleConnection(object):
         return rows
 
     @retry
-    async def remove_matching_data(self, dfObj: pd.DataFrame, outputTableName, match_cols: list) -> None:
+    async def remove_matching_data(self, dfObj: pd.DataFrame, outputTableName: str, match_cols: list) -> None:
         """
         Remove matching data from the warehouse
 
@@ -198,13 +198,13 @@ class AsyncOracleConnection(object):
         :return: None
         """
 
-        match_cols = ', '.join(match_cols)
+        df = dfObj[match_cols]
         param_list = []
         for column in match_cols:
             param_list.append(f"{column} = :{column}")
         params = ' AND '.join(param_list)
 
-        main_dict = dfObj.to_dict('records')
+        main_dict = df.to_dict('records')
         query = f"""DELETE FROM {outputTableName} WHERE {params}"""
         await self.execute_many(query, main_dict)
 

wcp_library/async_sql/postgres.py

@@ -171,7 +171,7 @@ class AsyncPostgresConnection(object):
         return rows
 
     @retry
-    async def remove_matching_data(self, dfObj: pd.DataFrame, outputTableName, match_cols: list) -> None:
+    async def remove_matching_data(self, dfObj: pd.DataFrame, outputTableName: str, match_cols: list) -> None:
         """
         Remove matching data from the warehouse
 
@@ -181,13 +181,13 @@ class AsyncPostgresConnection(object):
         :return: None
         """
 
-        match_cols = ', '.join(match_cols)
+        df = dfObj[match_cols]
         param_list = []
         for column in match_cols:
             param_list.append(f"{column} = %({column})s")
         params = ' AND '.join(param_list)
 
-        main_dict = dfObj.to_dict('records')
+        main_dict = df.to_dict('records')
         query = """DELETE FROM {} WHERE {}""".format(outputTableName, params)
         await self.execute_many(query, main_dict)
 

wcp_library/sql/oracle.py

@@ -192,7 +192,7 @@ class OracleConnection(object):
         return rows
 
     @retry
-    def remove_matching_data(self, dfObj: pd.DataFrame, outputTableName, match_cols: list) -> None:
+    def remove_matching_data(self, dfObj: pd.DataFrame, outputTableName: str, match_cols: list) -> None:
         """
         Remove matching data from the warehouse
 
@@ -202,13 +202,13 @@ class OracleConnection(object):
         :return: None
         """
 
-        match_cols = ', '.join(match_cols)
+        df = dfObj[match_cols]
         param_list = []
         for column in match_cols:
             param_list.append(f"{column} = :{column}")
         params = ' AND '.join(param_list)
 
-        main_dict = dfObj.to_dict('records')
+        main_dict = df.to_dict('records')
         query = f"""DELETE FROM {outputTableName} WHERE {params}"""
         self.execute_many(query, main_dict)
 

wcp_library/sql/postgres.py

@@ -172,7 +172,7 @@ class PostgresConnection(object):
         return rows
 
     @retry
-    def remove_matching_data(self, dfObj: pd.DataFrame, outputTableName, match_cols: list) -> None:
+    def remove_matching_data(self, dfObj: pd.DataFrame, outputTableName: str, match_cols: list) -> None:
         """
         Remove matching data from the warehouse
 
@@ -182,13 +182,13 @@ class PostgresConnection(object):
         :return: None
         """
 
-        match_cols = ', '.join(match_cols)
+        df = dfObj[match_cols]
         param_list = []
         for column in match_cols:
             param_list.append(f"{column} = %({column})s")
         params = ' AND '.join(param_list)
 
-        main_dict = dfObj.to_dict('records')
+        main_dict = df.to_dict('records')
         query = """DELETE FROM {} WHERE {}""".format(outputTableName, params)
         self.execute_many(query, main_dict)
 

{wcp_library-1.2.6.dist-info → wcp_library-1.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.2.6
+Version: 1.2.8
 Summary: Common utilites for internal development at WCP
 Home-page: https://github.com/Whitecap-DNA/WCP-Library
 Author: Mitch-Petersen

{wcp_library-1.2.6.dist-info → wcp_library-1.2.8.dist-info}/RECORD

@@ -4,8 +4,8 @@ wcp_library/async_credentials/api.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 wcp_library/async_credentials/oracle.py,sha256=MvC7wsHnSyAyPGnRVlH0dvvW2xk5ap_IAByoHX4rUWY,5436
 wcp_library/async_credentials/postgres.py,sha256=3wjqtLH0Nc-U80iscYnz5DV-9M2X4IjPW51C5MI2_tI,5297
 wcp_library/async_sql/__init__.py,sha256=m4eWmUGYUEDomhhOp1ScB2uSIXFsNUNO589o5RwWdyM,1035
-wcp_library/async_sql/oracle.py,sha256=dlV4H5axMuQtHYbdnSFIVGRIByX5GKK1mKHXuI2M430,7890
-wcp_library/async_sql/postgres.py,sha256=VMaJ9eKeFMvManTLlG3rCoCS3r3L3Ir0a0Pgq_235CE,7418
+wcp_library/async_sql/oracle.py,sha256=igiBA_Bb3hX4feyRH0AkLbSF1VITPiCAMJM4EGGQYTY,7880
+wcp_library/async_sql/postgres.py,sha256=fjnYGaIoEAeN8_ClOydBWd36s8NVp_dApCKH-PJyclg,7408
 wcp_library/credentials/__init__.py,sha256=HRmg7mqcATeclIz3lZQjSR4nmK6aY6MK9-QXEYZoFrw,1857
 wcp_library/credentials/ftp.py,sha256=FRxKVWifz7olQIrSjDgkTqk7rmc7Zdwmkfq7b62DQY8,4965
 wcp_library/credentials/oracle.py,sha256=IJVGd10LH5LUNKUSFAbApi0sjR1AbloMJRHTuR9zFrQ,5095
@@ -18,8 +18,8 @@ wcp_library/informatica.py,sha256=IXZtk_9X1XLbOEwFrsyOwTgajQKvtXgANBHmuTOP3Kk,40
 wcp_library/logging.py,sha256=e6gG7HFgUrMajUZs4Gs0atFfOJJmdmxN0GerfynNWlY,2061
 wcp_library/selenium_helper.py,sha256=rlphTXsUgnbaXZknY5nfQqxFhnc7UmrpzhV3hQ-cv7k,2509
 wcp_library/sql/__init__.py,sha256=CLlBEBrWVAwE79bUxuQiwikSrYH8m9QRYSJ2l0-ofsY,1003
-wcp_library/sql/oracle.py,sha256=R5oUCLeIVYzujFPOwQzL4vNbV3jgD9LYp38idAq9T9g,7711
-wcp_library/sql/postgres.py,sha256=HyT3xhYQxFks9V4mwzprHEiZVPC7yznKCxP3DHliMwM,7015
-wcp_library-1.2.6.dist-info/METADATA,sha256=h36xmJdGCvH6S0Z5BfLjdYrLtw6ZWnuQAIU10VazqBc,1513
-wcp_library-1.2.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-wcp_library-1.2.6.dist-info/RECORD,,
+wcp_library/sql/oracle.py,sha256=vkkI04MtedMoM6qafJsTKV6WFeSGqbpI5qvms_E6wWU,7701
+wcp_library/sql/postgres.py,sha256=P8eWsXmQSm9tJWYFgYzxfrPuVSFf-Uw8ArHCurEyozg,7005
+wcp_library-1.2.8.dist-info/METADATA,sha256=tuTS983VfwVeo0BXf4qpRxWqRJ090yN69B8bTKvBYx4,1513
+wcp_library-1.2.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+wcp_library-1.2.8.dist-info/RECORD,,