Merge pull request #27 from taabrcr/addTestRunner

Add Test Runner and Override data-warehouse-connection-pool-properties

Author: taabrcr

README.md

@@ -67,3 +67,35 @@ You require metabase to be installed alongside of your project
 2. `clojure -X:build :project-dir "\"$(pwd)\""`
 
 This will build a file called `target/teradata.metabase-driver.jar`; copy this to your Metabase `./plugins` directory.
+
+
+## Tests
+
+Invoking the test-runner with `clojure -X` will call the test function with a map of arguments,
+which can be supplied either in the alias (via `:exec-args`) or on the command-line, or both.
+
+Invoke it with:
+
+```bash
+clj -X:test ...args...
+```
+
+This will scan your project's `test` directory for any tests defined
+using `clojure.test` and run them.
+
+You may also supply any of the additional command line options:
+
+```
+  :dirs - coll of directories containing tests, default= ["test"]
+  :nses - coll of namespace symbols to test
+  :patterns - coll of regex strings to match namespaces
+  :vars - coll of fully qualified symbols to run tests on
+  :includes - coll of test metadata keywords to include
+  :excludes - coll of test metadata keywords to exclude"
+```
+
+If neither :dirs or :nses is supplied, will use:
+
+```
+  :patterns [".*-test$"]
+```

deps.edn

@@ -8,6 +8,7 @@
 
   :deps {
     org.clojure/clojure {:mvn/version "1.11.1"}
+    expectations/clojure-test {:mvn/version "1.2.1"}
     ; replace also the version in metabase-plugin.yaml
     metabase/metabase-core {:git/url "https://github.com/metabase/metabase.git" :git/tag "v0.43.0" :git/sha "ee686fcfe5"}
     metabase/build-drivers {:git/url "https://github.com/metabase/metabase.git" :git/tag "v0.43.0" :git/sha "ee686fcfe5" :deps/root "bin/build-drivers"}
@@ -24,5 +25,11 @@
     }
     ; We don't want to include metabase nor clojure in the uber jar
     :oss {:replace-deps  {} }
+
+    :test {:extra-paths ["test"]
+    :extra-deps {io.github.cognitect-labs/test-runner 
+                 {:git/tag "v0.5.1" :git/sha "dfb30dd"}}
+    :main-opts ["-m" "cognitect.test-runner"]
+    :exec-fn cognitect.test-runner.api/test}
   }
 }

src/metabase/driver/teradata.clj

@@ -8,7 +8,8 @@
             [java-time :as t]
             [metabase
              [driver :as driver]
-             [util :as u]]
+             [util :as u]
+             [config :as config]]
             [metabase.driver.sql-jdbc
              [common :as sql-jdbc.common]
              [connection :as sql-jdbc.conn]
@@ -308,3 +309,25 @@
 
 ; TODO check if overriding apply-top-level-clause could make nested queries work
 (defmethod driver/supports? [:teradata :nested-queries] [_ _] false)
+
+;; Overridden to customise the C3P0 properties which can be used to avoid the high number of logins against Teradata
+;; In case of such problem increase the value of acquireRetryDelay
+;; https://github.com/metabase/metabase/blob/master/src/metabase/driver/sql_jdbc/connection.clj#L42
+;; https://www.mchange.com/projects/c3p0/#acquireRetryDelay
+(defmethod sql-jdbc.conn/data-warehouse-connection-pool-properties :teradata
+  [driver database]
+  {
+   "acquireRetryDelay"            (or (config/config-int :mb-jdbc-c3po-acquire-retry-delay) 1000) 
+   "acquireIncrement"             1
+   "maxIdleTime"                  (* 3 60 60) ; 3 hours
+   "minPoolSize"                  1
+   "initialPoolSize"              1
+   "maxPoolSize"                  (or (config/config-int :mb-jdbc-data-warehouse-max-connection-pool-size) 15)
+   "testConnectionOnCheckout"     true
+   "maxIdleTimeExcessConnections" (* 5 60)
+   "dataSourceName"               (format "db-%d-%s-%s" (u/the-id database) (name driver) (->> database
+                                                                                               :details
+                                                                                               ((some-fn :db
+                                                                                                         :dbname
+                                                                                                         :sid
+                                                                                                         :catalog))))})

test/metabase/driver/teradata_test.clj

@@ -1,12 +1,18 @@
 (ns metabase.driver.teradata-test
-  (:require [expectations :refer :all]
+  (:require [expectations.clojure.test :refer [defexpect expect expecting]]
             [metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]))
 
+(def result
+  (sql-jdbc.conn/connection-details->spec :teradata {:host "localhost"
+    :additional-options  "CONNECT_FAILURE_TTL=300,ERROR_QUERY_INTERVAL=300000,RECONNECT_INTERVAL=300,COP=OFF,REDRIVE=0"}))
+
+(def hardcoded
+  {:classname                  "com.teradata.jdbc.TeraDriver"
+    :subprotocol                 "teradata"
+    :subname                     "//localhost/CHARSET=UTF8,TMODE=ANSI,ENCRYPTDATA=ON,FINALIZE_AUTO_CLOSE=ON,LOB_SUPPORT=OFF,CONNECT_FAILURE_TTL=300,ERROR_QUERY_INTERVAL=300000,RECONNECT_INTERVAL=300,COP=OFF,REDRIVE=0"})
+
 ;; Check that additional JDBC options are handled correctly. This is comma separated for Teradata.
-(expect
-  {:classname                   "com.teradata.jdbc.TeraDriver"
-   :subprotocol                 "teradata"
-   :subname                     "//localhost/CHARSET=UTF8,TMODE=ANSI,ENCRYPTDATA=ON,FINALIZE_AUTO_CLOSE=ON,LOB_SUPPORT=OFF,COP=OFF"
-   :delimiters                  "`"}
-  (-> (sql-jdbc.conn/connection-details->spec :teradata {:host "localhost"
-                                                         :additional-options  "COP=OFF"})))
+(defexpect db-test
+  (expect
+    hardcoded
+    result))