Skip to content

allow false value for BOOLEAN NOT NULL column #45

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 1 commit into from
Dec 13, 2014
Merged

allow false value for BOOLEAN NOT NULL column #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 16 additions & 28 deletions lib/postgresql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,16 +266,8 @@ PostgreSQL.prototype.create = function (model, data, callback) {
return self.columnEscaped(model, key)}).join(',')
);

var queryParams = [];
props.nonIdsInData.forEach(function(key) {
queryParams.push(data[key] !== undefined ? data[key] : null);
});
props.idsInData.forEach(function(key) {
queryParams.push(data[key] || null);
});

var idColName = self.idColumn(model);
this.query(sql.join(''), queryParams, function (err, info) {
this.query(sql.join(''), generateQueryParams(data, props), function (err, info) {
if (err) {
return callback(err);
}
Expand Down Expand Up @@ -360,15 +352,7 @@ PostgreSQL.prototype.save = function (model, data, callback) {
(props.nonIdsInData.length + i + 1));
});

var queryParams = [];
props.nonIdsInData.forEach(function(key) {
queryParams.push(data[key] !== undefined ? data[key] : null);
});
props.ids.forEach(function(key) {
queryParams.push(data[key] || null);
});

self.query(sql.join(''), queryParams, function (err) {
self.query(sql.join(''), generateQueryParams(data, props), function (err) {
callback(err);
});
};
Expand All @@ -381,17 +365,8 @@ PostgreSQL.prototype.update =
this.toFields(model, data), ' ', whereClause].join('');

var props = this._categorizeProperties(model, data);
var queryParams = [];
props.nonIdsInData.forEach(function(key) {
queryParams.push(data[key] !== undefined ? data[key] : null);
});
props.ids.forEach(function (key) {
if (data[key] !== undefined) {
queryParams.push(data[key] || null);
}
});

this.query(sql, queryParams, function (err, result) {
this.query(sql, generateQueryParams(data, props), function (err, result) {
if (callback) {
callback(err, result);
}
Expand Down Expand Up @@ -1530,4 +1505,17 @@ function propertyHasNotBeenDeleted(model, propName) {
return !!this._models[model].properties[propName];
}

function generateQueryParams(data, props) {
var queryParams = [];

function pushToQueryParams(key) {
queryParams.push(data[key] !== undefined ? data[key] : null);
}

props.nonIdsInData.forEach(pushToQueryParams);
props.idsInData.forEach(pushToQueryParams);

return queryParams;
}

require('./discovery')(PostgreSQL);
4 changes: 2 additions & 2 deletions test/postgresql.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ describe('postgresql connector', function () {
});

it('should support updating boolean types with false value', function(done) {
Post.update({id: post.id}, {approved: false}, function(err, p) {
Post.update({id: post.id}, {approved: false}, function(err) {
should.not.exists(err);
Post.findById(p.id, function(err, p) {
Post.findById(post.id, function(err, p) {
should.not.exists(err);
p.should.have.property('approved', false);
done();
Expand Down