allow keywords for table names, column names, and types, move internal code into its own file

1 files changed, 10 insertions, 10 deletions

diff --git a/src/clojure/contrib/sql/test/test.clj b/src/clojure/contrib/sql/test/test.clj
index 83df028f..13a0d09f 100644
--- a/src/clojure/contrib/sql/test/test.clj
+++ b/src/clojure/contrib/sql/test/test.clj
@@ -16,7 +16,7 @@
 (ns clojure.contrib.sql.test
   (:use clojure.contrib.sql))
 
-(Class/forName "org.apache.derby.jdbc.EmbeddedDriver")
+(clojure.lang.RT/classForName "org.apache.derby.jdbc.EmbeddedDriver")
 
 (defn db []
   (connection "derby" "/tmp/clojure.contrib.sql.test.db" :create true))
@@ -24,19 +24,19 @@
 (defn db-write []
   (with-connection con (db)
     (try
-     (drop-table con "fruit")
+     (drop-table con :fruit)
      (catch Exception e))
-    (create-table con "fruit"
-      "name varchar(32)"
-      "appearance varchar(32)"
-      "cost int"
-      "grade real")
-    (insert-rows con "fruit"
+    (create-table con :fruit
+      :name "varchar(32)"
+      :appearance "varchar(32)"
+      :cost :int
+      :grade :real)
+    (insert-rows con :fruit
       ["Apple" "red" 59 87]
       ["Banana" "yellow" 29 92.2]
       ["Peach" "fuzzy" 139 90.0]
       ["Orange" "juicy" 89 88.6])
-    (insert-values con "fruit" ["name" "cost"]
+    (insert-values con :fruit [:name :cost]
       ["Mango" 722]
       ["Feijoa" 441])))
 
@@ -54,7 +54,7 @@
 
 (defn db-exception []
   (with-connection con (db)
-    (insert-values con "fruit" ["name" "appearance"]
+    (insert-values con :fruit [:name :appearance]
       ["Grape" "yummy"]
       ["Pear" "bruised"])
     (throw (Exception. "an exception"))))