From 26e51d4edf18a0f2ef556611f459ee6f0cacff3f Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 22 Nov 2019 00:51:56 +0530 Subject: [PATCH] fix: Use sql method in getAll --- backends/sqlite.js | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/backends/sqlite.js b/backends/sqlite.js index 55323a7d..95b03e1f 100644 --- a/backends/sqlite.js +++ b/backends/sqlite.js @@ -212,25 +212,15 @@ class SqliteDatabase extends Database { filters = Object.assign({}, filters, meta.filters); } - return new Promise((resolve, reject) => { - let conditions = this.getFilterConditions(filters); - let query = `select ${fields.join(", ")} - from ${baseDoctype} - ${conditions.conditions ? "where" : ""} ${conditions.conditions} - ${groupBy ? ("group by " + groupBy.join(', ')) : ""} - ${orderBy ? ("order by " + orderBy) : ""} ${orderBy ? (order || "asc") : ""} - ${limit ? ("limit " + limit) : ""} ${start ? ("offset " + start) : ""}`; + let conditions = this.getFilterConditions(filters); + let query = `select ${fields.join(", ")} + from ${baseDoctype} + ${conditions.conditions ? "where" : ""} ${conditions.conditions} + ${groupBy ? ("group by " + groupBy.join(', ')) : ""} + ${orderBy ? ("order by " + orderBy) : ""} ${orderBy ? (order || "asc") : ""} + ${limit ? ("limit " + limit) : ""} ${start ? ("offset " + start) : ""}`; - this.conn.all(query, conditions.values, - (err, rows) => { - if (err) { - console.error(err); - reject(err); - } else { - resolve(rows); - } - }); - }); + return this.sql(query, conditions.values); } run(query, params) {