removed args

Author: Matthias Ekundayo

data_diff/databases/connect.py

@@ -143,6 +143,15 @@ def connect_to_uri(db_uri: str, thread_count: Optional[int] = 1) -> Database:
             assert not dsn.port
             kw["user"] = dsn.user
             kw["password"] = dsn.password
+
+        # if scheme == "presto":
+        #     kw["user"] = dsn.user
+        #     # kw["password"] = dsn.password
+        #     kw["host"] = dsn.host
+        #     kw["port"] = dsn.port
+        #     # kw["catalog"] = dsn.catalog
+        #     # kw["schema"] = dsn.schema
+
         else:
             kw["host"] = dsn.host
             kw["port"] = dsn.port

data_diff/databases/presto.py

@@ -1,5 +1,4 @@
 import re
-
 from .database_types import *
 from .base import Database, import_helper, _query_conn
 from .base import (
@@ -35,28 +34,26 @@ class Presto(Database):
     }
     ROUNDS_ON_PREC_LOSS = True
 
-    def __init__(self, host, port, user, password, *, catalog, schema=None,  **kw):
+    def __init__(self, **kw):
         prestodb = import_presto()
-        self.args = dict(
-            host=host, port=port, user=user, catalog=catalog, schema=schema, **kw
-        )  # include port if specified
-
-        if (
-            "cert" in self.args
-        ):  # cert used after connection to verify session, but keyword is not valid so remove from connection params
-            self.args.pop("cert")
 
-        if "auth" in kw and kw.get("auth") == "basic":  # if auth=basic, add basic authenticator for Presto
-            self.args["auth"] = prestodb.auth.BasicAuthentication(user, password)
+        if kw.get("schema"):
+            self.default_schema = kw.get("schema")
 
-        if schema:  # if schema was specified in URI, override default
-            self.default_schema = schema
-        self._conn = prestodb.dbapi.connect(**self.args)
-        # self._conn = prestodb.dbapi.connect(**kw)
+        if (
+            "password" in kw and "auth" in kw and kw.get("auth") == "basic"
+        ):  # if auth=basic, add basic authenticator for Presto
+            kw["auth"] = prestodb.auth.BasicAuthentication(kw.get("user"), kw.get("password"))
+            kw.pop("password")
 
         if "cert" in kw:  # if a certificate was specified in URI, verify session with cert
-            self._conn._http_session.verify = kw.get("cert")
+            cert = kw.get("cert")
+            kw.pop("cert")
+            self._conn = prestodb.dbapi.connect(**kw)
+            self._conn._http_session.verify = cert
 
+        else:
+            self._conn = prestodb.dbapi.connect(**kw)
 
     def quote(self, s: str):
         return f'"{s}"'

data_diff/databases/snowflake.py

@@ -9,7 +9,7 @@ def import_snowflake():
     import snowflake.connector
     from cryptography.hazmat.primitives import serialization
     from cryptography.hazmat.backends import default_backend
-    
+
     return snowflake, serialization, default_backend
 
 
@@ -27,18 +27,7 @@ class Snowflake(Database):
     }
     ROUNDS_ON_PREC_LOSS = False
 
-    def __init__(self,
-        account: str,
-        user: str,
-        *,
-        warehouse: str,
-        schema: str,
-        database: str,
-        role: str = None,
-        _port: int = None,
-        password: str = None,  # default to None incase ssh key is used
-        **kw,
-    ):
+    def __init__(self, *, schema: str, **kw):
         snowflake, serialization, default_backend = import_snowflake()
         logging.getLogger("snowflake.connector").setLevel(logging.WARNING)
 
@@ -49,7 +38,7 @@ def __init__(self,
 
         assert '"' not in schema, "Schema name should not contain quotes!"
         if (
-            not password and "key" in kw
+            "password" not in kw and "key" in kw
         ):  # if private keys are used instead of password for Snowflake connection, read in key from path specified and pass as "private_key" to connector.
             with open(kw.get("key"), "rb") as key:
                 p_key = serialization.load_pem_private_key(key.read(), password=None, backend=default_backend())
@@ -59,27 +48,10 @@ def __init__(self,
                 format=serialization.PrivateFormat.PKCS8,
                 encryption_algorithm=serialization.NoEncryption(),
             )
-            self._conn = snowflake.connector.connect(
-                user=user,
-                private_key=pkb,  # replaces password
-                account=account,
-                role=role,
-                database=database,
-                warehouse=warehouse,
-                schema=f'"{schema}"',
-                **kw,
-            )
+            self._conn = snowflake.connector.connect(private_key=pkb, schema=f'"{schema}"', **kw)  # replaces password
+
         else:  # otherwise use password for connection
-            self._conn = snowflake.connector.connect(
-                user=user,
-                password=password,
-                account=account,
-                role=role,
-                database=database,
-                warehouse=warehouse,
-                schema=f'"{schema}"',
-                **kw,
-            )
+            self._conn = snowflake.connector.connect(schema=f'"{schema}"', **kw)
 
         self.default_schema = schema
 

docs/requirements.txt

@@ -4,7 +4,6 @@ sphinx_markdown_tables
 sphinx-copybutton
 sphinx-rtd-theme
 recommonmark
-cryptography
 
 # Requirements. TODO Use poetry instead of this redundant list
 data_diff

pyproject.toml

@@ -37,6 +37,7 @@ preql = "^0.2.17"
 mysql-connector-python = "*"
 databricks-sql-connector = "*"
 snowflake-connector-python = "*"
+cryptography = "*"
 trino = "^0.314.0"
 psycopg2 = "*"
 presto-python-client = "*"
@@ -46,7 +47,7 @@ presto-python-client = "*"
 preql = ["preql"]
 mysql = ["mysql-connector-python"]
 postgresql = ["psycopg2"]
-snowflake = ["snowflake-connector-python"]
+snowflake = ["snowflake-connector-python", "cryptography"]
 presto = ["presto-python-client"]
 oracle = ["cx_Oracle"]
 databricks = ["databricks-sql-connector"]