Refactor idColumn use and bumped version to 3.1.2

feathersjs-ecosystem · Feb 15, 2019 · 5893fd1 · 5893fd1
1 parent b5ded3f
commit 5893fd1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 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": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://github.com/feathersjs-ecosystem/feathers-objection",
   "keywords": [
     "feathers",

diff --git a/src/index.js b/src/index.js
@@ -59,9 +59,9 @@ class Service extends AdapterService {
     const whitelist = Object.values(OPERATORS).concat(options.whitelist || []);
 
     super(Object.assign({
-      id: 'id',
+      id: options.model.idColumn || 'id',
       whitelist
-    }, { id: options.model.idColumn, ...options }));
+    }, options));
 
     this.idSeparator = options.idSeparator || ',';
     this.jsonSchema = options.model.jsonSchema;