fix(primaryKey): allow numeric integers as primaryKeys (#30)

* fix(primaryKey): allow numeric integers as primaryKeys

* tests

* docs(primaryKey): add allowed primary keys in readme

Author: gjuchault

README.md

@@ -40,6 +40,7 @@ User.index('email')
 ```
 
 You might also pass a third argument to requelize.model that looks like this: `{ primaryKey: string }`
+Primary keys allowed are: guid and integers
 
 ## Querying
 

lib/model/model.js

@@ -14,6 +14,11 @@ const hiddenProp = require('./util/hiddenProp')
 const parse = require('./parse')
 const saveAll = require('./saveAll')
 
+const idType = Joi.alternatives().try(
+  Joi.string().guid(),
+  Joi.number().integer()
+)
+
 /**
  * Bind requelize instance for createModel function
  * @internal
@@ -114,8 +119,8 @@ function createModel (requelize) {
       static _relField (foreignKey) {
         Model.index(foreignKey)
         Model._schema[foreignKey] = Joi.alternatives().try(
-          Joi.string().guid().optional().allow(null),
-          Joi.array().items(Joi.string().guid().optional().allow(null))
+          idType.optional().allow(null),
+          Joi.array().items(idType.optional().allow(null))
         )
       }
 
@@ -172,8 +177,8 @@ function createModel (requelize) {
         if (!through) {
           const tableName = generateJoinTableName(Model._name, model)
           const JoinModel = bindedCreateModel(tableName, {
-            [Model._name]: Joi.string().guid(),
-            [model]: Joi.string().guid()
+            [Model._name]: idType,
+            [model]: idType
           })
 
           JoinModel.index(Model._name)
@@ -338,7 +343,7 @@ function createModel (requelize) {
     }
 
     // Add primaryKey to schema
-    schema[options.primaryKey] = Joi.string().guid().optional().allow(null)
+    schema[options.primaryKey] = idType.optional().allow(null)
 
     Model._name = name
     Model._schema = schema

test/test.issue26.js

@@ -1,6 +1,6 @@
 const { test, requelize } = require('./utils')
 
-test('Issue #26', (t) => {
+test('Issue #26 - instantiate Model with null as initial data', (t) => {
   t.plan(1)
 
   const Foo = requelize.model('foo')

test/test.issue28.js

@@ -0,0 +1,39 @@
+const Joi = require('joi')
+const { test, requelize, dropDb } = require('./utils')
+
+test('Issue #28 - custom primary key type instead of guid', (t) => {
+  t.plan(3)
+
+  let Foo
+  let foo
+
+  dropDb()
+    .then(() => {
+      Foo = requelize.model('foo', { name: Joi.string() })
+
+      return requelize.sync()
+    })
+    .then(() => {
+      foo = new Foo({ id: 1, name: 'bar' })
+
+      return foo.save()
+    })
+    .then(() => {
+      return Foo.run()
+    })
+    .then((foos) => {
+      t.equal(1, foos.length, 'found model')
+      t.equal(1, foos[0].id, 'id is still the same')
+
+      return Foo.get(1)
+    })
+    .then((foo) => {
+      t.equal(1, foo.id, 'can query by id')
+    })
+    .catch((err) => {
+      t.fail(err)
+    })
+    .then(() => {
+      t.end()
+    })
+})