Browse Source

fixed db queries

Sotnikov, Dmitri 9 years ago
parent
commit
abf628858e

+ 2 - 1
frameworks/Clojure/luminus/hello/resources/sql/queries.sql

@@ -10,5 +10,6 @@ SELECT * FROM fortune
 -- :name update-world<! :<!
 -- :name update-world<! :<!
 -- update an existing world record
 -- update an existing world record
 UPDATE world
 UPDATE world
-SET randomNumber = :randomNumber
+SET "randomNumber" = :randomNumber
 WHERE id = :id
 WHERE id = :id
+RETURNING id

+ 0 - 2
frameworks/Clojure/luminus/hello/src/clj/hello/db/core.clj

@@ -113,5 +113,3 @@
     (let [updated-world (assoc world :randomNumber (inc (rand-int 9999)))]
     (let [updated-world (assoc world :randomNumber (inc (rand-int 9999)))]
       (update-world<! updated-world)
       (update-world<! updated-world)
       updated-world)))
       updated-world)))
-
-

+ 7 - 5
frameworks/Clojure/luminus/hello/src/clj/hello/routes/home.clj

@@ -18,13 +18,14 @@
 (defn single-query-test
 (defn single-query-test
   "Test 2: Single database query"
   "Test 2: Single database query"
   []
   []
-  (-> 1 db/run-queries first response/ok))
+  (-> 1 db/run-queries generate-string response/ok))
 
 
 (defn multiple-query-test
 (defn multiple-query-test
   "Test 3: Multiple database query"
   "Test 3: Multiple database query"
   [queries]
   [queries]
   (-> queries
   (-> queries
       db/run-queries
       db/run-queries
+      generate-string
       response/ok))
       response/ok))
 
 
 (defn fortunes
 (defn fortunes
@@ -37,6 +38,7 @@
   [queries]
   [queries]
   (-> queries
   (-> queries
       db/update-and-persist
       db/update-and-persist
+      generate-string
       response/ok))
       response/ok))
 
 
 (def plaintext
 (def plaintext
@@ -51,9 +53,9 @@
 
 
 (defroutes default-routes
 (defroutes default-routes
   (GET "/"                 [] "Hello, World!")
   (GET "/"                 [] "Hello, World!")
-  (GET "/db"               [] (single-query-test))
-  (GET "/queries/"         [] (multiple-query-test 1))
+  (GET "/db"               []        (single-query-test))
+  (GET "/queries/"         []        (multiple-query-test 1))
   (GET "/queries/:queries" [queries] (multiple-query-test queries))
   (GET "/queries/:queries" [queries] (multiple-query-test queries))
-  (GET "/fortunes"         [] (fortunes))
-  (GET "/updates/"         [] (db-update 1))
+  (GET "/fortunes"         []        (fortunes))
+  (GET "/updates/"         []        (db-update 1))
   (GET "/updates/:queries" [queries] (db-update queries)))
   (GET "/updates/:queries" [queries] (db-update queries)))