Minor improvements to generated HugSQL queries.
This commit is contained in:
parent
fdef14c0f5
commit
8acfc0038d
|
@ -35,13 +35,17 @@
|
||||||
pretty-name (s/replace (s/replace entity-name #"_" "-") #"s$" "")
|
pretty-name (s/replace (s/replace entity-name #"_" "-") #"s$" "")
|
||||||
all-property-names (map #(:name (:attrs %)) (vals (:properties (:content entity-map))))
|
all-property-names (map #(:name (:attrs %)) (vals (:properties (:content entity-map))))
|
||||||
]
|
]
|
||||||
(str "-- :name create-" pretty-name "! :! :n\n"
|
(str "-- :name create-" pretty-name "! :<!\n"
|
||||||
"-- :doc creates a new " pretty-name " record\n"
|
"-- :doc creates a new " pretty-name " record\n"
|
||||||
"INSERT INTO " entity-name "\n("
|
"INSERT INTO " entity-name " ("
|
||||||
(s/join ", " all-property-names)
|
(s/join ",\n\t" all-property-names)
|
||||||
")\nVALUES ("
|
")\nVALUES ("
|
||||||
(s/join ", " (map keyword all-property-names))
|
(s/join ",\n\t" (map keyword all-property-names))
|
||||||
")\n\n")))
|
")"
|
||||||
|
(if
|
||||||
|
(has-primary-key? entity-map)
|
||||||
|
(str "\nreturning " (s/join ",\n\t" (key-names entity-map))))
|
||||||
|
"\n\n")))
|
||||||
|
|
||||||
|
|
||||||
(defn update-query [entity-map]
|
(defn update-query [entity-map]
|
||||||
|
@ -71,7 +75,7 @@
|
||||||
(has-primary-key? entity-map)
|
(has-primary-key? entity-map)
|
||||||
(let [entity-name (:name (:attrs entity-map))
|
(let [entity-name (:name (:attrs entity-map))
|
||||||
pretty-name (s/replace (s/replace entity-name #"_" "-") #"s$" "")]
|
pretty-name (s/replace (s/replace entity-name #"_" "-") #"s$" "")]
|
||||||
(str "-- :name get-" pretty-name "! :! :n\n"
|
(str "-- :name get-" pretty-name " :? :1\n"
|
||||||
"-- :doc updates an existing " pretty-name " record\n"
|
"-- :doc updates an existing " pretty-name " record\n"
|
||||||
"SELECT * FROM " entity-name "\n"
|
"SELECT * FROM " entity-name "\n"
|
||||||
(where-clause entity-map)
|
(where-clause entity-map)
|
||||||
|
|
Loading…
Reference in a new issue