Merge branch 'erezsh:master' into master

Author: vmatt

sqeleton/databases/base.py

@@ -565,7 +565,7 @@ def _query_cursor(self, c, sql_code: CompiledCode) -> Optional[QueryResult]:
         assert isinstance(sql_code, CompiledCode), sql_code
         try:
             logger.debug(f"{self.name} Executing SQL: {sql_code.code} || {sql_code.args}")
-            c.execute(sql_code.code, sql_code.args or None)
+            c.execute(sql_code.code, sql_code.args or ())
             # insert, delete and update may return values if they have the "returning" clause.
             if sql_code.type is not None or sql_code.code.lstrip().lower().startswith(
                 ("select", "explain", "show", "with")

sqeleton/databases/oracle.py

@@ -171,7 +171,12 @@ class Oracle(ThreadedDatabase):
     CONNECT_URI_PARAMS = ["database?"]
 
     def __init__(self, *, host, database, thread_count, **kw):
-        self.kwargs = dict(dsn=f"{host}/{database}" if database else host, **kw)
+
+        self.kwargs = kw
+
+        # Build dsn if not present
+        if "dsn" not in kw:
+            self.kwargs["dsn"] = f"{host}/{database}" if database else host
 
         self.default_schema = kw.get("user").upper()