section 6 video 2

Author: tlipski

project.clj

@@ -11,5 +11,5 @@
   :dependencies [[org.clojure/clojure "1.5.1"]
   		 [org.clojure/data.json "0.2.3"]
 		 [org.postgresql/postgresql "9.2-1003-jdbc4"]
-		 [org.clojure/java.jdbc "0.3.2"]
+		 [korma "0.3.0-RC6"]
    	         [ring "1.2.0"]])

src/project1/blog.clj

@@ -2,34 +2,31 @@
  (:require [clojure.data.json :as json]
 	   [project1.route :as route]
 	   [project1.db :as db]
-	   [clojure.java.jdbc :as jdbc]
+	   [korma.core :as korma]
   	   [clojure.walk :as walk]))
 
 (defn get-blog-entries []
- (jdbc/query db/postgresql-db 
-  ["SELECT id, title, body FROM entries"]))
+ (korma/select db/entries))
 
 (defn add-blog-entry [entry]
- (jdbc/db-transaction [database db/postgresql-db]
-  (jdbc/insert! database :entries (select-keys entry [:title :body]))))
+ (korma/insert db/entries (korma/values (select-keys entry [:title :body]))))
 
 (defn get-blog-entry [id]
- (first (jdbc/query db/postgresql-db 
-		["SELECT id, title, body FROM entries WHERE id=?" id])))
+ (first (korma/select db/entries 
+		(korma/where {:id id}))))
 
 (defn update-blog-entry [id entry]
- (jdbc/db-transaction [database db/postgresql-db]
-   (jdbc/update! database :entries 
-		 (select-keys entry [:title :body])))
+ (korma/update db/entries 
+	(korma/set-fields (select-keys entry [:title :body]))
+	(korma/where {:id id}))
  (get-blog-entry id))
 
 (defn alter-blog-entry [id entry-values]
  (update-blog-entry id entry-values))
 
 (defn delete-blog-entry [id]
  (when (get-blog-entry id)
-  (jdbc/db-transaction [database db/postgresql-db]
-	(jdbc/delete! database :entries ["id=?" id]))
+  (korma/delete db/entries (korma/where {:id id}))
   {:id id}))
 
 

src/project1/db.clj

@@ -1,9 +1,14 @@
 (ns project1.db
-  (:require [clojure.java.jdbc :as jdbc]))
+  (:require [korma.db :as korma-db]
+            [korma.core :as korma]))
 
 (def postgresql-db
   {:classname "org.postgresql.Driver"
    :subprotocol "postgresql"
    :subname "//localhost:5432/clojure_blog"
    :user "clojure_blog"
    :password "clojure"})
+
+(korma-db/defdb korma-pool postgresql-db)
+
+(korma/defentity entries)