Skip to content

Support arbitrary db-spec k/vs from query params in URIs. #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 21, 2014
Merged

Support arbitrary db-spec k/vs from query params in URIs. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f16a054
Support arbitrary db-spec k/vs from query params in URIs.
technomancy Jan 21, 2014
fba097f
Add explict tests for URI-style DB specs.
technomancy Jan 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/main/clojure/clojure/java/jdbc.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ compatibility but it will be removed before a 1.0.0 release." }
PreparedStatement ResultSet SQLException Statement Types]
[java.util Hashtable Map Properties]
[javax.sql DataSource])
(:require [clojure.string :as str]))
(:require [clojure.string :as str]
[clojure.walk :as walk]))

(defn as-sql-name
"Given a naming strategy function and a keyword or string, return
Expand Down Expand Up @@ -141,15 +142,19 @@ compatibility but it will be removed before a 1.0.0 release." }
(let [host (.getHost uri)
port (if (pos? (.getPort uri)) (.getPort uri))
path (.getPath uri)
scheme (.getScheme uri)]
scheme (.getScheme uri)
query (.getQuery uri)
query-parts (and query (for [kvs (.split query "&")]
(vec (.split kvs "="))))]
(merge
{:subname (if port
(str "//" host ":" port path)
(str "//" host path))
:subprotocol (subprotocols scheme scheme)}
(if-let [user-info (.getUserInfo uri)]
{:user (first (str/split user-info #":"))
:password (second (str/split user-info #":"))}))))
:password (second (str/split user-info #":"))})
(walk/keywordize-keys (into {} query-parts)))))

(defn- strip-jdbc [^String spec]
(if (.startsWith spec "jdbc:")
Expand Down
14 changes: 14 additions & 0 deletions src/test/clojure/clojure/java/test_jdbc.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,20 @@
[:grade :real]
:table-spec "")))

(deftest test-uri-spec-parsing
(is (= {:advanced "false" :ssl "required" :password "clojure_test"
:user "clojure_test" :subname "//localhost/clojure_test"
:subprotocol "postgresql"}
(@#'sql/parse-properties-uri
(java.net.URI.
(str "postgres://clojure_test:clojure_test@localhost/clojure_test?"
"ssl=required&advanced=false")))))
(is (= {:password "clojure_test" :user "clojure_test"
:subname "//localhost:3306/clojure_test", :subprotocol "mysql"}
(@#'sql/parse-properties-uri
(java.net.URI.
"mysql://clojure_test:clojure_test@localhost:3306/clojure_test")))))

(deftest test-create-table
(doseq [db (test-specs)]
(create-test-table :fruit db)
Expand Down