Skip to content

Make it possible to have '' as default value #3

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
Jul 8, 2017
Merged

Make it possible to have '' as default value #3

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
13 changes: 12 additions & 1 deletion lib/sqlutil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,18 @@ export class Table {
let primaryKey = column.primaryKey ? ' PRIMARY KEY' : '';
let unique = column.unique && !column.primaryKey ? ' UNIQUE' : '';
let notNull = column.notNull && !column.primaryKey ? ' NOT NULL' : '';
let defaultValue = !_.isUndefined(column.defaultValue) && !_.isNull(column.defaultValue) ? ` DEFAULT ${column.defaultValue}` : '';
let defaultValue = '';
if (!_.isUndefined(column.defaultValue) && !_.isNull(column.defaultValue)) {
if (_.isNumber(column.defaultValue)) {
defaultValue = ` DEFAULT ${column.defaultValue}`;
}
else if (_.isString(column.defaultValue)) {
defaultValue = ` DEFAULT "${column.defaultValue}"`;
}
else {
throw new Error(`Invalid type for default value for column ${columnName}`);
}
}

columnDescriptions.push(`${columnName} ${column.type}${primaryKey}${unique}${notNull}${defaultValue}`);

Expand Down
23 changes: 23 additions & 0 deletions test/sqlutil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,29 @@ describe('sqlutil', () => {
});
});

it('should be possible to have default value \'\' for columns', () => {
let defaultValueTable = new sqlutil.Table(db, {
name: 'defaultValueTableEmptyString',
columns: {
id: {type: sqlutil.DataType.INTEGER, primaryKey: true},
name: {type: sqlutil.DataType.TEXT, unique: true},
value: {type: sqlutil.DataType.TEXT, notNull: true, defaultValue: ''}
}
});

return defaultValueTable.createTable()
.then(() => defaultValueTable.insert({name: 'keyWithValue', value: '1'}))
.then(() => defaultValueTable.insert({name: 'keyWithoutValue'}))
.then(() => {
return expect(defaultValueTable.find({name: 'keyWithValue'}).get())
.to.eventually.deep.equal({id: 1, name: 'keyWithValue', value: '1'});
})
.then(() => {
return expect(defaultValueTable.find({name: 'keyWithoutValue'}).get())
.to.eventually.deep.equal({id: 2, name: 'keyWithoutValue', value: ''});
});
});

it('should be possible to have non-unique indices', () => {
let indexTable = new sqlutil.Table(db, {
name: 'indexTable',
Expand Down