Skip to content

Commit 0115215

Browse files
committed
Make db-queries to work if function
This commits make the db-queries at xiana.db to work if it is a function. Same functionality as query
1 parent ab1bbd9 commit 0115215

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

src/xiana/db.clj

+13-10
Original file line numberDiff line numberDiff line change
@@ -193,17 +193,20 @@
193193
{:select [:*] :from [:users]}."
194194
{:name ::db-access
195195
:leave
196-
(fn [{query-or-fn :query
197-
db-queries :db-queries
198-
:as state}]
196+
(fn [{query-or-fn :query
197+
db-queries-or-fn :db-queries
198+
:as state}]
199199
(let [datasource (get-in state [:deps :db :datasource])
200-
query (cond
201-
(fn? query-or-fn) (query-or-fn state)
202-
:else query-or-fn)
203-
db-data (cond-> []
204-
query (into (execute datasource query))
205-
db-queries (into (multi-execute! datasource db-queries))
206-
:always seq)]
200+
query (cond
201+
(fn? query-or-fn) (query-or-fn state)
202+
:else query-or-fn)
203+
db-queries (cond
204+
(fn? db-queries-or-fn) (db-queries-or-fn state)
205+
:else db-queries-or-fn)
206+
db-data (cond-> []
207+
query (into (execute datasource query))
208+
db-queries (into (multi-execute! datasource db-queries))
209+
:always seq)]
207210
(assoc-in state [:response-data :db-data] db-data)))
208211
:error
209212
(fn [state]

0 commit comments

Comments
 (0)