From cd7a4e4675316315f53ea7aae938c7802c4cd737 Mon Sep 17 00:00:00 2001
From: Cam Saul <1455846+camsaul@users.noreply.github.com>
Date: Fri, 11 Feb 2022 16:18:05 -0800
Subject: [PATCH] Support running Oracle tests with local Docker image (#20358)
---
.../oracle/test/metabase/test/data/oracle.clj | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/modules/drivers/oracle/test/metabase/test/data/oracle.clj b/modules/drivers/oracle/test/metabase/test/data/oracle.clj
index 7e9c174bd9f..759db5736a5 100644
--- a/modules/drivers/oracle/test/metabase/test/data/oracle.clj
+++ b/modules/drivers/oracle/test/metabase/test/data/oracle.clj
@@ -36,12 +36,13 @@
;; Session password is only used when creating session user, not anywhere else
(defn- connection-details []
- (let [details* {:host (tx/db-test-env-var-or-throw :oracle :host)
- :port (Integer/parseInt (tx/db-test-env-var-or-throw :oracle :port "1521"))
- :user (tx/db-test-env-var-or-throw :oracle :user)
- :password (tx/db-test-env-var-or-throw :oracle :password)
- :sid (tx/db-test-env-var-or-throw :oracle :sid)
- :ssl (tx/db-test-env-var :oracle :ssl false)}
+ (let [details* {:host (tx/db-test-env-var-or-throw :oracle :host "localhost")
+ :port (Integer/parseInt (tx/db-test-env-var-or-throw :oracle :port "1521"))
+ :user (tx/db-test-env-var-or-throw :oracle :user "system")
+ :password (tx/db-test-env-var-or-throw :oracle :password "password")
+ :sid (tx/db-test-env-var :oracle :sid)
+ :service-name (tx/db-test-env-var :oracle :service-name (when-not (tx/db-test-env-var :oracle :sid) "XEPDB1"))
+ :ssl (tx/db-test-env-var :oracle :ssl false)}
ssl-keys [:ssl-use-truststore :ssl-truststore-options :ssl-truststore-path :ssl-truststore-value
:ssl-truststore-password-value
:ssl-use-keystore :ssl-use-keystore-options :ssl-keystore-path :ssl-keystore-value
--
GitLab