- Changed countDistinct to be used only with joinRelation operator

- Bumped version to 4.4.3
feathersjs-ecosystem · Oct 11, 2019 · b6234cb · b6234cb
1 parent ec3e409
commit b6234cb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "feathers-objection",
   "description": "A service plugin for ObjectionJS an ORM based on KnexJS",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "homepage": "https://github.com/feathersjs-ecosystem/feathers-objection",
   "keywords": [
     "feathers",

diff --git a/src/index.js b/src/index.js
@@ -349,10 +349,15 @@ class Service extends AdapterService {
       if (count) {
         const idColumns = Array.isArray(this.id) ? this.id.map(idKey => `${this.Model.tableName}.${idKey}`) : [`${this.Model.tableName}.${this.id}`];
 
-        const countQuery = this._createQuery(params)
-          .skipUndefined()
-          .joinRelation(query.$joinRelation)
-          .countDistinct({ total: idColumns });
+        const countQuery = this._createQuery(params);
+
+        if (query.$joinRelation) {
+          countQuery
+            .joinRelation(query.$joinRelation)
+            .countDistinct({ total: idColumns });
+        } else {
+          countQuery.count({ total: idColumns });
+        }
 
         this.objectify(countQuery, query);