collate-data-diff 0.11.5__tar.gz → 0.11.6__tar.gz

{collate_data_diff-0.11.5 → collate_data_diff-0.11.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: collate-data-diff
-Version: 0.11.5
+Version: 0.11.6
 Summary: Command-line tool and Python library to efficiently diff rows across two different databases.
 License: MIT
 Author: Collate

{collate_data_diff-0.11.5 → collate_data_diff-0.11.6}/data_diff/databases/_connect.py

@@ -1,4 +1,5 @@
 import logging
+import json
 from typing import Hashable, MutableMapping, Type, Optional, Union, Dict
 from itertools import zip_longest
 from contextlib import suppress
@@ -291,7 +292,7 @@ class Connect:
 
     def __make_cache_key(self, db_conf: Union[str, dict]) -> Hashable:
         if isinstance(db_conf, dict):
-            return tuple(db_conf.items())
+            return json.dumps(db_conf)
         return db_conf
 
 

{collate_data_diff-0.11.5 → collate_data_diff-0.11.6}/data_diff/databases/presto.py

@@ -154,7 +154,7 @@ class Presto(Database):
 
     def __init__(self, **kw) -> None:
         super().__init__()
-        if not len(kw):
+        if not len(kw) or kw.get("driver") == "trino":
             # this is a trino connection
             return
         self.default_schema = "public"

{collate_data_diff-0.11.5 → collate_data_diff-0.11.6}/data_diff/databases/trino.py

@@ -1,6 +1,7 @@
 from typing import Any, ClassVar, Type
 
 import attrs
+from requests import Session
 
 from data_diff.abcs.database_types import TemporalType, ColType_UUID
 from data_diff.databases import presto
@@ -47,4 +48,30 @@ class Trino(presto.Presto):
         if kw.get("schema"):
             self.default_schema = kw.get("schema")
 
+        if kw.get("http_session"):
+            session = Session()
+            session.proxies = kw.get("http_session", {}).get("proxies")
+
+            kw["http_session"] = session
+
+        auth = kw.get("auth")
+
+        if auth:
+            if auth.get("authType") == "basic":
+                kw["auth"] = trino.auth.BasicAuthentication(
+                    auth.get("username"),
+                    auth.get("password")
+                )
+                kw["http_scheme"] = "https"
+
+            elif auth.get("authType") == "jwt":
+                kw["auth"] = trino.auth.JWTAuthentication(
+                    auth.get("jwt")
+                )
+                kw["http_scheme"] = "https"
+
+            elif auth.get("authType") == "oauth2":
+                kw["auth"] = trino.auth.OAuth2Authentication()
+                kw["http_scheme"] = "https"
+                
         self._conn = trino.dbapi.connect(**kw)

{collate_data_diff-0.11.5 → collate_data_diff-0.11.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "collate-data-diff"
-version = "0.11.5"
+version = "0.11.6"
 description = "Command-line tool and Python library to efficiently diff rows across two different databases."
 authors = ["Collate <info@getcollate.io>", "Datafold <data-diff@datafold.com>"]
 license = "MIT"