Browse Source

fix for postgres column name

Sotnikov, Dmitri 9 years ago
parent
commit
b8a1ec6777

+ 0 - 1
frameworks/Clojure/luminus/hello/resources/migrations/20160307145316-add-users-table.down.sql

@@ -1 +0,0 @@
-DROP TABLE users;

+ 0 - 9
frameworks/Clojure/luminus/hello/resources/migrations/20160307145316-add-users-table.up.sql

@@ -1,9 +0,0 @@
-CREATE TABLE users
-(id VARCHAR(20) PRIMARY KEY,
- first_name VARCHAR(30),
- last_name VARCHAR(30),
- email VARCHAR(30),
- admin BOOLEAN,
- last_login TIME,
- is_active BOOLEAN,
- pass VARCHAR(300));

+ 0 - 6
frameworks/Clojure/luminus/hello/resources/sql/queries.sql

@@ -7,9 +7,3 @@ WHERE id = :id
 -- select all records from the fortune table
 SELECT * FROM fortune
 
--- :name update-world<! :<!
--- update an existing world record
-UPDATE world
-SET "randomNumber" = :randomNumber
-WHERE id = :id
-RETURNING id

+ 1 - 9
frameworks/Clojure/luminus/hello/src/clj/hello/core.clj

@@ -2,7 +2,6 @@
   (:require [hello.handler :as handler]
             [luminus.repl-server :as repl]
             [luminus.http-server :as http]
-            [luminus-migrations.core :as migrations]
             [hello.config :refer [env]]
             [clojure.tools.cli :refer [parse-opts]]
             [clojure.tools.logging :as log]
@@ -53,12 +52,5 @@
   (.addShutdownHook (Runtime/getRuntime) (Thread. stop-app)))
 
 (defn -main [& args]
-  (cond
-    (some #{"migrate" "rollback"} args)
-    (do
-      (mount/start #'hello.config/env)
-      (migrations/migrate args (env :database-url))
-      (System/exit 0))
-    :else
-    (start-app args)))
+  (start-app args))
 

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

@@ -106,6 +106,13 @@
    (conj (get-all-fortunes)
          {:id 0 :message "Additional fortune added at request time."})))
 
+(defn update-world<! [{:keys [randomNumber id]}]
+  (jdbc/update!
+    *db*
+    :world
+    {"\"randomNumber\"" randomNumber}
+    ["id = ?" id]))
+
 (defn update-and-persist
   "Changes the :randomNumber of a number of world entities.
   Persists the changes to sql then returns the updated entities"

+ 1 - 0
frameworks/Clojure/luminus/hello/src/clj/hello/routes/home.clj

@@ -26,6 +26,7 @@
   []
   (-> 1
       db/run-queries
+      first
       encode-json-response))
 
 (defn multiple-query-test