From 4edea959ea604ffafd2f3970dc86bf1c6d8b68af Mon Sep 17 00:00:00 2001
From: Michael Beer <michael@crate.io>
Date: Wed, 23 Nov 2016 13:56:12 +0100
Subject: [PATCH] changed psql port of CrateDB in test suite
to avoid test conflicts with the standard PostgreSQL port 5432
the default port of CrateDB is now set to 5200.
---
bin/ci | 6 ++++--
src/metabase/driver/crate.clj | 7 +++----
test/metabase/test/data/crate.clj | 3 +--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bin/ci b/bin/ci
index ecf061bf825..95987c59e62 100755
--- a/bin/ci
+++ b/bin/ci
@@ -59,11 +59,13 @@ node-6() {
install-crate() {
- sudo add-apt-repository ppa:crate/stable -y
+ sudo add-apt-repository ppa:crate/testing -y
sudo apt-get update
- sudo apt-get install -y crate
+ sudo apt-get install -y crate=0.57.3-1~trusty
# ulimit setting refused Crate service to start on CircleCI container - so comment it
sudo sed -i '/MAX_LOCKED_MEMORY/s/^/#/' /etc/init/crate.conf
+ echo "psql.port: 5200" | sudo tee -a /etc/crate/crate.yml
+ echo "psql.enabled: true" | sudo tee -a /etc/crate/crate.yml
sudo service crate restart
}
diff --git a/src/metabase/driver/crate.clj b/src/metabase/driver/crate.clj
index a189139104a..38417e30a24 100644
--- a/src/metabase/driver/crate.clj
+++ b/src/metabase/driver/crate.clj
@@ -43,16 +43,15 @@
(defn- crate-spec
[{:keys [hosts]
- :or {hosts "//localhost:5432/"}
:as opts}]
(merge {:classname "io.crate.client.jdbc.CrateDriver" ; must be in classpath
:subprotocol "crate"
- :subname (str hosts)}
+ :subname (str "//" hosts "/")}
(dissoc opts :hosts)))
(defn- can-connect? [details]
(let [connection-spec (crate-spec details)]
- (= 1 (first (vals (first (jdbc/query connection-spec ["select 1 from sys.cluster"])))))))
+ (= 1 (first (vals (first (jdbc/query connection-spec ["select 1"])))))))
(defn- string-length-fn [field-key]
(hsql/call :char_length field-key))
@@ -69,7 +68,7 @@
:date-interval crate-util/date-interval
:details-fields (constantly [{:name "hosts"
:display-name "Hosts"
- :default "//localhost:5432/"}])
+ :default "localhost:5432"}])
:features (comp (u/rpartial set/difference #{:foreign-keys}) sql/features)})
sql/ISQLDriver
(merge (sql/ISQLDriverDefaultsMixin)
diff --git a/test/metabase/test/data/crate.clj b/test/metabase/test/data/crate.clj
index f231b0fa62e..c9ffab09424 100644
--- a/test/metabase/test/data/crate.clj
+++ b/test/metabase/test/data/crate.clj
@@ -51,8 +51,7 @@
(insert! rows))))
(def ^:private database->connection-details
- (constantly {:host "localhost"
- :port 4300}))
+ (constantly {:hosts "localhost:5200"}))
(extend CrateDriver
generic/IGenericSQLDatasetLoader
--
GitLab