Skip to content

Allow non-id serial properties #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 20, 2017
Merged

Allow non-id serial properties #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
718f4f7
Allow non-id serial properties
zbarbuto Jan 10, 2017
62d146f
Add test for serial properties
zbarbuto Apr 19, 2017
5e1a4db
Remove comment
zbarbuto Apr 19, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/migration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ function mixinMigration(PostgreSQL) {
var self = this;
var modelDef = this.getModelDefinition(model);
var prop = modelDef.properties[propName];
if (prop.id && prop.generated) {
if (prop.generated) {
return 'SERIAL';
}
var result = self.columnDataType(model, propName);
Expand Down
62 changes: 62 additions & 0 deletions test/postgresql.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ require('loopback-datasource-juggler/test/common.batch.js');
require('loopback-datasource-juggler/test/include.test.js');

require('./init');
var async = require('async');
var should = require('should');

var Post, db, created;
Expand Down Expand Up @@ -500,6 +501,67 @@ describe('postgresql connector', function() {
});
});

describe('Serial properties', function() {
var db;

before(function() {
db = getSchema();
});

it('should allow serial properties', function(done) {
var schema =
{
'name': 'TestInventory',
'options': {
'idInjection': false,
'postgresql': {
'schema': 'public', 'table': 'inventorytest',
},
},
'properties': {
'productId': {
'type': 'String', 'required': true, 'id': true,
},
'productCode': {
'type': 'number', 'generated': true,
},
},
};
var models = db.modelBuilder.buildModels(schema);
var Model = models['TestInventory'];
var count = 0;
Model.attachTo(db);

db.automigrate(function(err, data) {
async.series([
function(callback) {
Model.destroyAll(callback);
},
function(callback) {
Model.create({productId: 'p001'}, callback);
},
function(callback) {
Model.create({productId: 'p002'}, callback);
},
function(callback) {
Model.findOne({where: {productId: 'p001'}}, function(err, r) {
r.should.have.property('productId');
r.should.have.property('productCode', 1);
callback(null, r);
});
},
function(callback) {
Model.findOne({where: {productId: 'p002'}}, function(err, r) {
r.should.have.property('productId');
r.should.have.property('productCode', 2);
callback(null, r);
});
},
], done);
});
});
});

// FIXME: The following test cases are to be reactivated for PostgreSQL
/*

Expand Down