spice-couchbase 2.0.21 → 2.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-couchbase",
-  "version": "2.0.21",
+  "version": "2.0.22",
   "description": "",
   "main": "build/index.js",
   "scripts": {

package/src/index.js

@@ -402,57 +402,32 @@ module.exports = class Database {
     type,
     columns,
     query,
-    limit,
-    offset,
+    limit = 0,
+    offset = 0,
     order_by,
-    do_count,
+    do_count = "false",
     query_scope
   ) {
-    let is_legacy =
+    const is_legacy =
       this.scope_name !== "_default" && this.collection_name !== "_default";
-    let alias = "_reference";
-    let bucket = `\`${
+    const bucket = `\`${
       this.use_bucket_name ? this.bucket : this.collection_name
     }\``;
 
     try {
-      //let uses_scopes = this.scope this.scope_name !== "_default";
+      const fix = `, META(${bucket}).id AS id`;
 
-      if (do_count == undefined) {
-        do_count = "false";
-      }
-      var fix = "";
-      var count_query = "";
-      if (!limit) {
-        limit = 0;
-      }
-
-      if (!offset) {
-        offset = 0;
-      }
-
-      if (columns == "*") {
-        columns = "(" + bucket + ").*";
-        fix = ", META(" + bucket + ").id  AS id";
-      }
-
-      if (!columns) {
-        columns = "(" + bucket + ").*";
-        fix = ", META(" + bucket + ").id AS id";
-      }
-
-      if (columns == "id") {
-        fix = ", META(" + bucket + ").id AS id";
+      if (columns === "*" || !columns) {
+        columns = `(${bucket}).*`;
+      } else if (columns !== "id") {
+        columns = `${columns}${fix}`;
+      } else {
         columns = "";
       }
 
-      var front_query = `SELECT ${columns} ${fix} FROM ${bucket}`;
-
-      if (is_legacy || query) {
-        front_query += " WHERE ";
-      }
+      const front_query = `SELECT ${columns} ${fix} FROM ${bucket}`;
+      const conditions = [];
 
-      let conditions = [];
       if (this.use_bucket_name) {
         conditions.push(`type = '${type}'`);
       }
@@ -460,34 +435,24 @@ module.exports = class Database {
         conditions.push(query);
       }
 
-      query = front_query + conditions.join(" AND ");
+      const where_clause = conditions.length ? " WHERE " : "";
+      query = front_query + where_clause + conditions.join(" AND ");
 
-      count_query = `SELECT count(meta().id) as count FROM ${bucket}`;
-      if (this.use_bucket_name || query) {
-        count_query += " WHERE ";
-      }
-      query = front_query + conditions.join(" AND ");
+      const count_query = `SELECT count(meta().id) as count FROM ${bucket}${where_clause}`;
+      const order_by_clause = order_by ? ` ORDER BY ${order_by}` : "";
+      const limit_clause = limit > 0 ? ` LIMIT ${limit}` : "";
+      const offset_clause = offset > 0 ? ` OFFSET ${offset}` : "";
 
-      if (order_by) {
-        query = `${query} ORDER BY ${order_by}`;
-      }
-
-      if (limit > 0) {
-        query = query + " LIMIT " + limit;
-      }
-
-      if (offset > 0) {
-        query = query + " OFFSET " + offset;
-      }
+      query = query + order_by_clause + limit_clause + offset_clause;
 
-      let active_query_space =
+      const active_query_space =
         query_scope || !this.use_bucket_name ? "scope" : "cluster";
 
-      let queries = [this.getData(query, active_query_space)];
+      const queries = [this.getData(query, active_query_space)];
       if (do_count === "true") {
         queries.push(this.getCount(count_query, active_query_space));
       }
-      let responses = await Promise.all(queries);
+      const responses = await Promise.all(queries);
 
       return {
         data: responses[0],