snippet.clj:

- updated to use parameterized queries
- added tests

Author: stuarthalloway

examples/snippet.clj

@@ -74,20 +74,20 @@
 
 ; START: sql-query
 (defn sql-query [q]
-  (with-query-results res [q] (doall res)))
+  (with-query-results res q (doall res)))
 ; END: sql-query
 
 (defn select-snippet [id]
   (with-connection db
-    (first (sql-query (str "select * from snippets where id = " (coerce Integer id))))))
+    (first (sql-query ["select * from snippets where id = ?" (coerce Integer id)]))))
 
 ; START: last-created-id
 (defn last-created-id 
   "Extract the last created id. Must be called in a transaction
    that performed an insert. Expects HSQLDB return structure of
    the form [{:@p0 id}]."
   []
-  (first (vals (first (sql-query "CALL IDENTITY()")))))
+  (first (vals (first (sql-query ["CALL IDENTITY()"])))))
 ; END: last-created-id
 
 ; START: insert-snippet

examples/test.clj

@@ -9,7 +9,7 @@
 	    :sequences :index-of-any :life-without-multi :multimethods.default
 	    :macros :macros.chain-1 :macros.chain-2 :macros.chain-3 :macros.chain-4
 	    :macros.chain-5 :lazy-index-of-any :macros.bench-1
-	    :concurrency :functional :snake]))
+	    :concurrency :functional :snake :snippet]))
 
 (def lancet-tests 
      (map #(symbol (str "lancet.test." (name %)))

examples/test/snippet.clj

@@ -0,0 +1,25 @@
+(ns examples.test.snippet
+    (:use clojure.contrib.test-is clojure.contrib.sql examples.snippet))
+
+(deftest insert-and-select-some-snippets
+  (let [stub-time (now)]
+    (binding [now (fn [] stub-time)]
+      (sample-snippets)
+      (is (= [{:id 0, :body "(println :boo)", :created_at stub-time}
+	      {:id 1, :body "(defn foo [] 1)", :created_at stub-time}]
+	     (select-snippets)))
+      (insert-snippet "boo!")
+      (is (= {:id 2, :body "boo!", :created_at stub-time}
+	     (select-snippet 2))))))
+
+(deftest drop-and-create-snippets-table
+  (with-connection db (drop-snippets))
+  (is (= "Table not found in statement [select * from snippets]"
+	 (.getMessage (is (thrown? java.sql.SQLException (select-snippets))))))
+  (ensure-snippets-table-exists)
+  (is (= nil (select-snippets))))
+
+
+
+
+

runtests.sh

@@ -1 +1 @@
-java -cp lib/clojure.jar:lib/clojure-contrib.jar:lib/ant.jar:lib/ant-launcher.jar:. clojure.lang.Script examples/test.clj
+java -cp lib/clojure.jar:lib/clojure-contrib.jar:lib/hsqldb.jar:lib/ant.jar:lib/ant-launcher.jar:. clojure.lang.Script examples/test.clj