datamarket 0.9.10__py3-none-any.whl → 0.9.12__py3-none-any.whl

datamarket/interfaces/alchemy.py

@@ -122,13 +122,11 @@ class AlchemyInterface:
         if not silent:
             logger.info(f"upserting {alchemy_obj}")
 
-        primary_keys = list(
-            column.name for column in alchemy_obj.__table__.primary_key.columns.values()
-        )
+        primary_keys = list(col.name for col in alchemy_obj.__table__.primary_key.columns.values())
         obj_dict = {
-            column.name: getattr(alchemy_obj, column.name)
-            for column in alchemy_obj.__table__.columns
-            if column.name not in primary_keys
+            col.name: val
+            for col in alchemy_obj.__table__.columns
+            if col.name not in primary_keys and (val := getattr(alchemy_obj, col.name)) is not None
         }
 
         statement = (

datamarket/interfaces/peerdb.py

@@ -113,7 +113,7 @@ class ClickhousePeer:
         if "clickhouse" in config:
             self.config = config["clickhouse"]
             self.credentials = {key: self.config[key] for key in ["user", "password", "host", "port"]}
-            
+
         else:
             logger.warning("no clickhouse section in config")
 
@@ -122,7 +122,7 @@ class ClickhousePeer:
             return
 
         self.ensure_database_exists(database)
-        self.config["database"] = database
+        self.config["database"] = self.credentials["database"] = database
         self.client = clickhouse_driver.Client(**self.credentials)
 
     def _check_connection(self):

{datamarket-0.9.10.dist-info → datamarket-0.9.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamarket
-Version: 0.9.10
+Version: 0.9.12
 Summary: Utilities that integrate advanced scraping knowledge into just one library.
 License: GPL-3.0-or-later
 Author: DataMarket

{datamarket-0.9.10.dist-info → datamarket-0.9.12.dist-info}/RECORD

@@ -1,11 +1,11 @@
 datamarket/__init__.py,sha256=FHS77P9qNewKMoN-p0FLEUEC60oWIYup1QkbJZP4ays,12
 datamarket/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datamarket/interfaces/alchemy.py,sha256=5ZER9xiGj-7TqWrLiLUMk-rpiJFrqLffvqZzsqJdG5o,6388
+datamarket/interfaces/alchemy.py,sha256=Gkb-55kgHz-07wpfxQfCHP-jCtj7k-WcRAaQWqDaNRs,6377
 datamarket/interfaces/aws.py,sha256=7KLUeBxmPN7avEMPsu5HC_KHB1N7W6Anp2X8fo43mlw,2383
 datamarket/interfaces/drive.py,sha256=shbV5jpQVe_KPE-8Idx6Z9te5Zu1SmVfrvSAyd9ZIgE,2915
 datamarket/interfaces/ftp.py,sha256=o0KlJxtksbop9OjCiQRzyAa2IeG_ExVXagS6apwrAQo,1881
 datamarket/interfaces/nominatim.py,sha256=_gFJ04D-ju5xn3wuaGT5Pj5jhf4F5eINpxOpuQL_dIQ,3664
-datamarket/interfaces/peerdb.py,sha256=WKMMHlTGB8piDah-mpepWhgKFvgPZmhaVU3Ueh04oY0,22213
+datamarket/interfaces/peerdb.py,sha256=2FrG7E5BAGxhwoxjjlPP7ceE7bmUpQi54jtTPtjQul0,22232
 datamarket/interfaces/proxy.py,sha256=updoOStKd8-nQBbxWbnD9eOt6HksnYi-5dQ0rEySf5M,3152
 datamarket/interfaces/tinybird.py,sha256=AYrcRGNOCoCt7ojilkWa27POROee9sTCwZ61GGHEPeM,2698
 datamarket/params/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -17,7 +17,7 @@ datamarket/utils/main.py,sha256=O6rX-65h4h0j2zs9dofdTPlly5reKDnvgLtTwbLmbWg,6529
 datamarket/utils/selenium.py,sha256=IMKlbLzXABFhACnWzhHmB0l2hhVzNwHGZwbo14nEewQ,2499
 datamarket/utils/soda.py,sha256=eZTXFbI1P3WoMd1MM-YjoVTpdjTcDSWuvBb7ViBMhSQ,941
 datamarket/utils/typer.py,sha256=FDF3l6gh3UlAFPsHCtesnekvct2rKz0oFn3uKARBQvE,814
-datamarket-0.9.10.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-datamarket-0.9.10.dist-info/METADATA,sha256=ncaRgyuLuOvB8PFN3QHs-IdVRDOEcz-GUwvayTrickk,6363
-datamarket-0.9.10.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-datamarket-0.9.10.dist-info/RECORD,,
+datamarket-0.9.12.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+datamarket-0.9.12.dist-info/METADATA,sha256=MQMyFcVTBRhkR3RMrWV0m5QRH9TEJidAZsKD4lIchns,6363
+datamarket-0.9.12.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+datamarket-0.9.12.dist-info/RECORD,,