Skip to content
Snippets Groups Projects
Commit 2d5f2c76 authored by Cam Saul's avatar Cam Saul
Browse files

test fix

parent 85a56123
Branches
Tags
No related merge requests found
......@@ -100,12 +100,13 @@
"Parse a legacy `database.details.conn_str` CONNECTION-STRING and return a new-style map."
[connection-string]
{:pre [(string? connection-string)]}
(-<>> connection-string
(s/split <> #" ") ; split into k=v pairs
(map (fn [pair] ; convert to {:k v} pairs
(let [[k v] (s/split pair #"=")]
{(keyword k) v})))
(reduce conj {})))
(let [details (-<>> connection-string
(s/split <> #" ") ; split into k=v pairs
(map (fn [pair] ; convert to {:k v} pairs
(let [[k v] (s/split pair #"=")]
{(keyword k) v})))
(reduce conj {}))]
(assoc details :port (Integer/parseInt (:port details)))))
(defn- database->connection-details [{:keys [details]}]
(let [{:keys [host port] :as details} (if (is-legacy-conn-details? details) (parse-legacy-conn-str (:conn_str details))
......
......@@ -7,9 +7,10 @@
;; ## legacy postgres
(expect {:user "cam"
:dbname "fakedb"
:port "5432"
:port 5432
:host "localhost"
:timezone "US/Pacific"}
:timezone "US/Pacific"
:conn_str "host=localhost port=5432 dbname=fakedb user=cam"}
(convert-details-when-legacy
:postgres
{:conn_str "host=localhost port=5432 dbname=fakedb user=cam"
......@@ -21,7 +22,7 @@
:postgres
{:ssl false
:host "localhost"
:port "5432"
:port 5432
:dbname "ryde"
:user "cam"
:conn_str "host=localhost port=5432 dbname=ryde user=cam"}))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment