From b18585a9fe21f49d9a5c8142787478f71700fd76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cam=20Sa=C3=BCl?= <cammsaul@gmail.com>
Date: Wed, 3 May 2017 10:53:42 -0700
Subject: [PATCH] Make Oracle SID connection param optional
---
src/metabase/driver/oracle.clj | 9 ++++-----
test/metabase/driver/oracle_test.clj | 17 +++++++++++++++--
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/metabase/driver/oracle.clj b/src/metabase/driver/oracle.clj
index 960fd999f05..7b44e7e1558 100644
--- a/src/metabase/driver/oracle.clj
+++ b/src/metabase/driver/oracle.clj
@@ -48,8 +48,9 @@
:or {host "localhost", port 1521}
:as details}]
(-> (merge {:subprotocol "oracle:thin"
- :subname (str "@" host ":" port ":" sid)}
- (dissoc details :host :port))
+ :subname (str "@" host ":" port (when sid
+ (str ":" sid)))}
+ (dissoc details :host :port :sid))
sql/handle-additional-options))
(defn- can-connect? [details]
@@ -207,7 +208,7 @@
:default 1521}
{:name "sid"
:display-name "Oracle System ID"
- :default "ORCL"}
+ :placeholder "ORCL"}
{:name "user"
:display-name "Database username"
:placeholder "What username do you use to login to the database?"
@@ -270,10 +271,8 @@
;; only register the Oracle driver if the JDBC driver is available
(when (u/ignore-exceptions
(Class/forName "oracle.jdbc.OracleDriver"))
-
;; By default the Oracle JDBC driver isn't compliant with JDBC standards -- instead of returning types like java.sql.Timestamp
;; it returns wacky types like oracle.sql.TIMESTAMPT. By setting this System property the JDBC driver will return the appropriate types.
;; See this page for more details: http://docs.oracle.com/database/121/JJDBC/datacc.htm#sthref437
(.setProperty (System/getProperties) "oracle.jdbc.J2EE13Compliant" "TRUE")
-
(driver/register-driver! :oracle (OracleDriver.)))
diff --git a/test/metabase/driver/oracle_test.clj b/test/metabase/driver/oracle_test.clj
index 5d93f468364..9aa329dec26 100644
--- a/test/metabase/driver/oracle_test.clj
+++ b/test/metabase/driver/oracle_test.clj
@@ -9,9 +9,22 @@
;; make sure we can set additional connection string options
(expect
{:subprotocol "oracle:thin"
- :subname "@localhost:1521:ORCL?serviceName=myservicename"
- :sid "ORCL"}
+ :subname "@localhost:1521:ORCL?serviceName=myservicename"}
(sql/connection-details->spec (OracleDriver.) {:host "localhost"
:port 1521
:sid "ORCL"
:additional-options "serviceName=myservicename"}))
+
+;; make sure we can connect with or without an SID
+(expect
+ {:subprotocol "oracle:thin"
+ :subname "@localhost:1521:ORCL"}
+ (sql/connection-details->spec (OracleDriver.) {:host "localhost"
+ :port 1521
+ :sid "ORCL"}))
+
+(expect
+ {:subprotocol "oracle:thin"
+ :subname "@localhost:1521"}
+ (sql/connection-details->spec (OracleDriver.) {:host "localhost"
+ :port 1521}))
--
GitLab