Merge pull request #422 from strongloop/disc-migr

tests: checks if column is discovered and mapped correctly

Author: agnes512

package.json

@@ -24,7 +24,7 @@
     "bluebird": "^3.4.6",
     "chalk": "^3.0.0",
     "debug": "^4.1.1",
-    "loopback-connector": "^4.2.2",
+    "loopback-connector": "^4.10.2",
     "pg": "^7.0.0",
     "strong-globalize": "^4.0.0",
     "uuid": "^3.0.1"

test/postgresql.discover.test.js

@@ -8,6 +8,7 @@ process.env.NODE_ENV = 'test';
 require('should');
 
 const assert = require('assert');
+const should = require('should');
 const _ = require('lodash');
 
 const DataSource = require('loopback-datasource-juggler').DataSource;
@@ -239,6 +240,36 @@ describe('Discover model properties', function() {
 });
 
 describe('Discover model primary keys', function() {
+  let Demo;
+  before(function(done) {
+    const demo_schema = {
+      'name': 'Demo',
+      'options': {
+        'idInjection': false,
+        'postgresql': {
+          'schema': 'public',
+          'table': 'demo',
+        },
+      },
+      'properties': {
+        'id': {
+          'type': 'Number',
+          'required': true,
+          'id': 1,
+          'postgresql': {
+            'columnName': 'demoId',
+          },
+        },
+        'name': {
+          'type': 'String',
+          'required': true,
+        },
+      },
+    };
+    Demo = db.createModel(demo_schema.name, demo_schema.properties, demo_schema.options);
+    Demo.destroyAll(done);
+  });
+
   it('should return an array of primary keys for product', function(done) {
     db.discoverPrimaryKeys('product', function(err, models) {
       if (err) {
@@ -257,6 +288,32 @@ describe('Discover model primary keys', function() {
     });
   });
 
+  it('should discover primary key and db generates instances properly', function(done) {
+    db.discoverPrimaryKeys('demo', function(err, models) {
+      if (err) {
+        console.error(err);
+        done(err);
+      } else {
+        models.length.should.be.equal(1);
+        assert.deepEqual(models[0], {owner: 'public',
+          tableName: 'demo',
+          columnName: 'demoId',
+          keySeq: 1,
+          pkName: 'demo_pkey'});
+      }
+    });
+    Demo.create({id: 1, name: 'checkCase'}, function(err) {
+      should.not.exist(err);
+      Demo.findOne({}, function(err, d) {
+        should.not.exist(err);
+        should.exist(d);
+        d.should.have.property('id', 1);
+        d.should.have.property('name', 'checkCase');
+        done();
+      });
+    });
+  });
+
   it('should return an array of primary keys for strongloop.product', function(done) {
     db.discoverPrimaryKeys('product', {owner: 'strongloop'}, function(err, models) {
       if (err) {

test/schema.sql

@@ -113,7 +113,7 @@ ALTER SEQUENCE account_id_seq OWNED BY account.id;
 
 CREATE TABLE demo (
     name text NOT NULL,
-    id integer NOT NULL
+    "demoId" integer NOT NULL
 );
 
 
@@ -133,7 +133,7 @@ CREATE SEQUENCE demo_id_seq
 -- Name: demo_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: strongloop
 --
 
-ALTER SEQUENCE demo_id_seq OWNED BY demo.id;
+ALTER SEQUENCE demo_id_seq OWNED BY demo."demoId";
 
 
 --
@@ -1243,7 +1243,7 @@ ALTER TABLE ONLY account
 --
 
 ALTER TABLE ONLY demo
-    ADD CONSTRAINT demo_pkey PRIMARY KEY (id);
+    ADD CONSTRAINT demo_pkey PRIMARY KEY ("demoId");
 
 
 --