Mods to import syntax to get it working; introduce h2 as database so no MySQL required

Author: Rory Gibson

.gitignore

@@ -1 +1,5 @@
 target
+.idea/
+greeter.h2.db
+greeter.trace.db
+src/greeter/Greeter.iml

project.clj

@@ -8,6 +8,7 @@
                  [mysql/mysql-connector-java "5.1.6"]
                  [org.slf4j/slf4j-nop "1.6.4"]
                  [org.thymeleaf/thymeleaf "2.0.8"]
+                 [com.h2database/h2 "1.3.170"]                              
                  [expectations "1.4.17"]]
 
   :plugins [[lein-ring "0.7.3"] 

src/greeter/db.clj

@@ -2,12 +2,18 @@
   (:require [clojure.java.jdbc :as sql]))  
 
 ;; Database creation and population
-(def db {:classname "com.mysql.jdbc.Driver"
+(def mysqldb {:classname "com.mysql.jdbc.Driver"
          :subprotocol "mysql"
          :subname "//localhost:3306/helloworld"
          :user "root"
          :password ""})
 
+(def h2db {:classname   "org.h2.Driver"
+           :subprotocol "h2:file"
+           :subname     (str (System/getProperty "user.dir") "/" "greeter")
+           :user        "sa"
+           :password    "" })
+
 (defn drop-table-from [conn]
   (try
     (sql/with-connection conn

src/greeter/svr.clj

@@ -4,27 +4,27 @@
   (:use [ring.adapter.jetty :only [run-jetty]])
   (:require [compojure.handler :as handler]
             [compojure.route   :as route]
-            [greeter.util]
-            [greeter.db :refer]
-            [greeter.thymeleaf]))
-  
+            [greeter.util :refer :all]
+            [greeter.db :refer :all]
+            [greeter.thymeleaf :refer :all]))
+ 
 
 ;; Set up the DB
-(drop-table-from db)
-(create-table-from db)
-(insert-records-in db)
+(drop-table-from h2db)
+(create-table-from h2db)
+(insert-records-in h2db)
 
 ;; Route/handler bindings        
 (defroutes app-routes
   (GET "/:forename" [forename]
     (let [engine  (create-engine)
-          surname (lookup-surname-of forename db)
+          surname (lookup-surname-of forename h2db)
           context (create-context { "forename" forename "surname" surname })] 
       (.process engine "greeting" context)))
 
   (route/not-found 
     (let [engine  (create-engine)
-          names   (strip-keywords-from-array (all-names-from db))
+          names   (strip-keywords-from-array (all-names-from h2db))
           context (create-context { "allnames" names})]
       (.process engine "index" context))))