omit :target key from Mckoi config and tests

lansend · Jun 26, 2012 · add5875 · add5875
1 parent 0260c91
commit add5875
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ Sections below describe which of the keys are applicable to various databases:
 | HSQLDB   | `:hsqldb`  | `:memory`  | `:database`             |               |
 |          |            | `:filesys` | `:database`             |               |
 |          |            | `:network` | `:host` `:database`     | `:port`       |
-| Mckoi    | `:mckoi`   | `:filesys` | `:database`             |               |
+| Mckoi    | `:mckoi`   |            | `:database`             |               |
 | SQLite   | `:sqlite`  | `:memory`  |                         |               |
 |          |            | `:filesys` | `:database`             |               |
 

diff --git a/src/clj_dbcp/adapter.clj b/src/clj_dbcp/adapter.clj
@@ -133,9 +133,7 @@
                      :username  "sa"
                      :password  ""}
     :mckoi          {:classname "com.mckoi.JDBCDriver"
-                     :jdbc-url
-                     (matcher-target
-                       {:filesys (U "jdbc:mckoi:local://%s" :database)})
+                     :jdbc-url  (U "jdbc:mckoi:local://%s" :database)
                      :val-query "SELECT 1"}
     :sqlite         {:classname "org.sqlite.JDBC"
                      :jdbc-url

diff --git a/test/clj_dbcp/core_test.clj b/test/clj_dbcp/core_test.clj
@@ -90,8 +90,7 @@
    {:classname "org.apache.derby.jdbc.EmbeddedDriver"
     :subprotocol "derby"
     :subname "memory:defaultsubprotoexplicit;create=true;"
-    :val-query "values(1)"}
-   ])
+    :val-query "values(1)"}])
 
 
 (deftest test-jdbc
@@ -111,7 +110,7 @@
    {:adapter :derby   :target :filesys :database 'target/default}
    {:adapter :h2      :target :filesys :database 'target/default}
    {:adapter :hsqldb  :target :filesys :database 'target/default}
-   {:adapter :mckoi   :target :filesys :database "./test/mckoi.conf"
+   {:adapter :mckoi                    :database "./test/mckoi.conf"
     :user "sa" :password "pw"
     :setup du/setup-mckoi-local-database}
    {:adapter :sqlite  :target :filesys :database 'target/default3}