Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Fix require-sql to use . instead of / in internal ns name
  • Loading branch information
joelittlejohn committed Aug 12, 2016
commit 2eb89a6872e4c016990e753afbf330710a3dd890
5 changes: 3 additions & 2 deletions src/yesql/core.clj
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(ns yesql.core
(:require [yesql.util :refer [slurp-from-classpath]]
[yesql.generate :refer [generate-var]]
[yesql.queryfile-parser :refer [parse-tagged-queries]]))
[yesql.queryfile-parser :refer [parse-tagged-queries]]
[clojure.string :as str]))

(defn defqueries
"Defines several query functions, as defined in the given SQL file.
Expand Down Expand Up @@ -47,7 +48,7 @@
(throw (Exception. "Missing an :as or a :refer")))
(let [current-ns (ns-name *ns*)
;; Keep this .sql file's defqueries in a predictable place:
target-ns (symbol (str "yesquire/" sql-file))]
target-ns (-> (str "yesquire/" sql-file) (str/replace #"/" ".") symbol)]
`(do
(ns-unalias *ns* '~as)
(create-ns '~target-ns)
Expand Down
4 changes: 4 additions & 0 deletions test/yesql/core_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@

(expect var? #'combined/edge)

(expect first (combined/edge {} {:connection yesql.core-test/derby-db}))

(require-sql ["yesql/sample_files/combined_file.sql" :refer [the-time]])

(expect var? #'the-time)

(expect first (the-time {} {:connection yesql.core-test/derby-db}))