Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

omit :target key from Mckoi config and tests

  • Loading branch information...
commit add587544ae4d9a33a1cfcbf42789bd69fe28f27 1 parent 0260c91
Shantanu Kumar authored June 27, 2012
2  README.md
Source Rendered
@@ -69,7 +69,7 @@ Sections below describe which of the keys are applicable to various databases:
69 69
 | HSQLDB   | `:hsqldb`  | `:memory`  | `:database`             |               |
70 70
 |          |            | `:filesys` | `:database`             |               |
71 71
 |          |            | `:network` | `:host` `:database`     | `:port`       |
72  
-| Mckoi    | `:mckoi`   | `:filesys` | `:database`             |               |
  72
+| Mckoi    | `:mckoi`   |            | `:database`             |               |
73 73
 | SQLite   | `:sqlite`  | `:memory`  |                         |               |
74 74
 |          |            | `:filesys` | `:database`             |               |
75 75
 
4  src/clj_dbcp/adapter.clj
@@ -133,9 +133,7 @@
133 133
                      :username  "sa"
134 134
                      :password  ""}
135 135
     :mckoi          {:classname "com.mckoi.JDBCDriver"
136  
-                     :jdbc-url
137  
-                     (matcher-target
138  
-                       {:filesys (U "jdbc:mckoi:local://%s" :database)})
  136
+                     :jdbc-url  (U "jdbc:mckoi:local://%s" :database)
139 137
                      :val-query "SELECT 1"}
140 138
     :sqlite         {:classname "org.sqlite.JDBC"
141 139
                      :jdbc-url
5  test/clj_dbcp/core_test.clj
@@ -90,8 +90,7 @@
90 90
    {:classname "org.apache.derby.jdbc.EmbeddedDriver"
91 91
     :subprotocol "derby"
92 92
     :subname "memory:defaultsubprotoexplicit;create=true;"
93  
-    :val-query "values(1)"}
94  
-   ])
  93
+    :val-query "values(1)"}])
95 94
 
96 95
 
97 96
 (deftest test-jdbc
@@ -111,7 +110,7 @@
111 110
    {:adapter :derby   :target :filesys :database 'target/default}
112 111
    {:adapter :h2      :target :filesys :database 'target/default}
113 112
    {:adapter :hsqldb  :target :filesys :database 'target/default}
114  
-   {:adapter :mckoi   :target :filesys :database "./test/mckoi.conf"
  113
+   {:adapter :mckoi                    :database "./test/mckoi.conf"
115 114
     :user "sa" :password "pw"
116 115
     :setup du/setup-mckoi-local-database}
117 116
    {:adapter :sqlite  :target :filesys :database 'target/default3}

0 notes on commit add5875

Please sign in to comment.
Something went wrong with that request. Please try again.