Skip to content

public / sequelize

Go to a project

不要怂，就是干，撸起袖子干！

Commit 46f8b891 by Mick Hansen
Options

refactor primary key stuff

1 parent feb56a6e
Inline Side-by-side
Showing with 103 additions and 92 deletions
lib/dao-factory.js
...@@ -120,72 +120,81 @@ module.exports = (function() { ...@@ -120,72 +120,81 @@ module.exports = (function() {
this.primaryKeys = {} this.primaryKeys = {}
self.options.uniqueKeys = {} self.options.uniqueKeys = {}
Utils._.each(this.rawAttributes, function(columnValues, columnName) { // Setup names of timestamp attributes
if (columnValues.hasOwnProperty('unique') && columnValues.unique !== true && columnValues.unique !== false) { this._timestampAttributes = {}
var idxName = columnValues.unique if (this.options.timestamps) {
if (typeof columnValues.unique === "object") { if (this.options.createdAt) {
idxName = columnValues.unique.name this._timestampAttributes.createdAt = Utils._.underscoredIf(this.options.createdAt, this.options.underscored)
}
if (this.options.updatedAt) {
this._timestampAttributes.updatedAt = Utils._.underscoredIf(this.options.updatedAt, this.options.underscored)
}
if (this.options.paranoid && this.options.deletedAt) {
this._timestampAttributes.deletedAt = Utils._.underscoredIf(this.options.deletedAt, this.options.underscored)
}
}
// Identify primary and unique attributes
Utils._.each(this.rawAttributes, function(options, attribute) {
if (options.hasOwnProperty('unique') && options.unique !== true && options.unique !== false) {
var idxName = options.unique
if (typeof options.unique === "object") {
idxName = options.unique.name
} }
self.options.uniqueKeys[idxName] = self.options.uniqueKeys[idxName] || {fields: [], msg: null} self.options.uniqueKeys[idxName] = self.options.uniqueKeys[idxName] || {fields: [], msg: null}
self.options.uniqueKeys[idxName].fields.push(columnName) self.options.uniqueKeys[idxName].fields.push(attribute)
self.options.uniqueKeys[idxName].msg = self.options.uniqueKeys[idxName].msg || columnValues.unique.msg || null self.options.uniqueKeys[idxName].msg = self.options.uniqueKeys[idxName].msg || options.unique.msg || null
} }
})
Utils._.each(this.attributes, function(dataTypeString, attributeName) { if (options.primaryKey === true) {
if (dataTypeString.indexOf('PRIMARY KEY') !== -1) { self.primaryKeys[attribute] = self.attributes[attribute]
self.primaryKeys[attributeName] = dataTypeString
} }
}) })
// Add head and tail default attributes (id, timestamps)
addDefaultAttributes.call(this)
addOptionalClassMethods.call(this)
findAutoIncrementField.call(this)
// Primary key convenience variables
this.primaryKeyAttributes = Object.keys(this.primaryKeys) this.primaryKeyAttributes = Object.keys(this.primaryKeys)
this.primaryKeyAttribute = this.primaryKeyAttributes[0]
this.primaryKeyCount = this.primaryKeyAttributes.length this.primaryKeyCount = this.primaryKeyAttributes.length
this.options.hasPrimaryKeys = this.hasPrimaryKeys = this.primaryKeyCount > 0 this._hasPrimaryKeys = this.options.hasPrimaryKeys = this.hasPrimaryKeys = this.primaryKeyCount > 0
this._isPrimaryKey = Utils._.memoize(function (key) {
return self.primaryKeyAttributes.indexOf(key) !== -1
})
if (typeof this.options.defaultScope === "object") { if (typeof this.options.defaultScope === "object") {
Utils.injectScope.call(this, this.options.defaultScope) Utils.injectScope.call(this, this.options.defaultScope)
} }
// DAO prototype // DAO prototype
// WTF ... ?
this.DAO = function() { this.DAO = function() {
DAO.apply(this, arguments); DAO.apply(this, arguments);
} }
Util.inherits(this.DAO, DAO); Util.inherits(this.DAO, DAO);
this._timestampAttributes = {}
if (this.options.timestamps) {
if (this.options.createdAt) {
this._timestampAttributes.createdAt = Utils._.underscoredIf(this.options.createdAt, this.options.underscored)
}
if (this.options.updatedAt) {
this._timestampAttributes.updatedAt = Utils._.underscoredIf(this.options.updatedAt, this.options.underscored)
}
if (this.options.paranoid && this.options.deletedAt) {
this._timestampAttributes.deletedAt = Utils._.underscoredIf(this.options.deletedAt, this.options.underscored)
}
this.DAO.prototype._readOnlyAttributes = Object.keys(this._timestampAttributes) this._readOnlyAttributes = Object.keys(this._timestampAttributes)
} this.DAO.prototype._readOnlyAttributes = this._readOnlyAttributes // To be removed
this._hasReadOnlyAttributes = this._readOnlyAttributes && this._readOnlyAttributes.length
this.DAO.prototype._hasReadOnlyAttributes = this._hasReadOnlyAttributes // To be removed
this.DAO.prototype._hasReadOnlyAttributes = this.DAO.prototype._readOnlyAttributes && this.DAO.prototype._readOnlyAttributes.length this._isReadOnlyAttribute = Utils._.memoize(function (key) {
this.DAO.prototype._isReadOnlyAttribute = Utils._.memoize(function (key) { return self._hasReadOnlyAttributes && self._readOnlyAttributes.indexOf(key) !== -1
return self.DAO.prototype._hasReadOnlyAttributes && self.DAO.prototype._readOnlyAttributes.indexOf(key) !== -1
}) })
this.DAO.prototype._isReadOnlyAttribute = this._isReadOnlyAttribute // To be removed
addDefaultAttributes.call(this) this.DAO.prototype._hasPrimaryKeys = this._hasPrimaryKeys // To be removed
addOptionalClassMethods.call(this) this.DAO.prototype._isPrimaryKey = this._isPrimaryKey // To be removed
findAutoIncrementField.call(this)
this.DAO.prototype.rawAttributes = this.rawAttributes; this.DAO.prototype.rawAttributes = this.rawAttributes;
this.DAO.prototype._hasPrimaryKeys = this.options.hasPrimaryKeys
this.DAO.prototype._isPrimaryKey = Utils._.memoize(function (key) {
return self.primaryKeyAttributes.indexOf(key) !== -1 && key !== 'id'
})
if (this.options.instanceMethods) { if (this.options.instanceMethods) {
Utils._.each(this.options.instanceMethods, function(fct, name) { Utils._.each(this.options.instanceMethods, function(fct, name) {
self.DAO.prototype[name] = fct self.DAO.prototype[name] = fct
...@@ -1273,7 +1282,11 @@ module.exports = (function() { ...@@ -1273,7 +1282,11 @@ module.exports = (function() {
var addDefaultAttributes = function() { var addDefaultAttributes = function() {
var self = this var self = this
, tail = {} , tail = {}
, head = { , head = {}
// Add id if no primary key was manually added to definition
if (!Object.keys(this.primaryKeys).length) {
head = {
id: { id: {
type: DataTypes.INTEGER, type: DataTypes.INTEGER,
allowNull: false, allowNull: false,
...@@ -1282,9 +1295,6 @@ module.exports = (function() { ...@@ -1282,9 +1295,6 @@ module.exports = (function() {
_autoGenerated: true _autoGenerated: true
} }
} }
if (this.hasPrimaryKeys) {
head = {}
} }
if (this._timestampAttributes.createdAt) { if (this._timestampAttributes.createdAt) {
...@@ -1313,6 +1323,10 @@ module.exports = (function() { ...@@ -1313,6 +1323,10 @@ module.exports = (function() {
self.rawAttributes[attr] = value self.rawAttributes[attr] = value
} }
}) })
if (!Object.keys(this.primaryKeys).length) {
self.primaryKeys['id'] = self.attributes['id']
}
} }
var findAutoIncrementField = function() { var findAutoIncrementField = function() {
...@@ -1341,8 +1355,12 @@ module.exports = (function() { ...@@ -1341,8 +1355,12 @@ module.exports = (function() {
options.includeNames.push(include.as) options.includeNames.push(include.as)
options.includeNames.push(include.as.substr(0,1).toLowerCase() + include.as.substr(1)) options.includeNames.push(include.as.substr(0,1).toLowerCase() + include.as.substr(1))
if (include.association.isMultiAssociation || include.hasMultiAssociation) options.hasMultiAssociation = true if (include.association.isMultiAssociation || include.hasMultiAssociation) {
if (include.association.isSingleAssociation || include.hasSingleAssociation) options.hasSingleAssociation = true options.hasMultiAssociation = true
}
if (include.association.isSingleAssociation || include.hasSingleAssociation) {
options.hasSingleAssociation = true
}
options.hasIncludeWhere = options.hasIncludeWhere || include.hasIncludeWhere || !!include.where options.hasIncludeWhere = options.hasIncludeWhere || include.hasIncludeWhere || !!include.where
options.hasIncludeRequired = options.hasIncludeRequired || include.hasIncludeRequired || !!include.required options.hasIncludeRequired = options.hasIncludeRequired || include.hasIncludeRequired || !!include.required
...@@ -1374,8 +1392,8 @@ module.exports = (function() { ...@@ -1374,8 +1392,8 @@ module.exports = (function() {
var primaryKeys; var primaryKeys;
if (include.daoFactory.hasPrimaryKeys) { if (include.daoFactory.hasPrimaryKeys) {
primaryKeys = [] primaryKeys = []
for (var field_name in include.daoFactory.primaryKeys) { for (var field in include.daoFactory.primaryKeys) {
primaryKeys.push(field_name) primaryKeys.push(field)
} }
} else { } else {
primaryKeys = ['id'] primaryKeys = ['id']
...@@ -1386,7 +1404,9 @@ module.exports = (function() { ...@@ -1386,7 +1404,9 @@ module.exports = (function() {
} }
// pseudo include just needed the attribute logic, return // pseudo include just needed the attribute logic, return
if (include._pseudo) return include if (include._pseudo) {
return include
}
if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) { if (include.hasOwnProperty('daoFactory') && (include.hasOwnProperty('as'))) {
var usesAlias = (include.as !== include.daoFactory.tableName) var usesAlias = (include.as !== include.daoFactory.tableName)
...@@ -1403,7 +1423,9 @@ module.exports = (function() { ...@@ -1403,7 +1423,9 @@ module.exports = (function() {
// If through, we create a pseudo child include, to ease our parsing later on // If through, we create a pseudo child include, to ease our parsing later on
if (Object(include.association.through) === include.association.through) { if (Object(include.association.through) === include.association.through) {
if (!include.include) include.include = [] if (!include.include) {
include.include = []
}
var through = include.association.through var through = include.association.through
include.through = { include.through = {
......
lib/dao.js
...@@ -9,9 +9,9 @@ module.exports = (function() { ...@@ -9,9 +9,9 @@ module.exports = (function() {
var DAO = function(values, options) { var DAO = function(values, options) {
this.dataValues = {} this.dataValues = {}
this._previousDataValues = {} this._previousDataValues = {}
this.__options = this.__factory.options this.__options = this.Model.options
this.options = options this.options = options
this.hasPrimaryKeys = this.__factory.options.hasPrimaryKeys this.hasPrimaryKeys = this.Model.options.hasPrimaryKeys
// What is selected values even used for? // What is selected values even used for?
this.selectedValues = options.include ? _.omit(values, options.includeNames) : values this.selectedValues = options.include ? _.omit(values, options.includeNames) : values
this.__eagerlyLoadedAssociations = [] this.__eagerlyLoadedAssociations = []
...@@ -23,7 +23,7 @@ module.exports = (function() { ...@@ -23,7 +23,7 @@ module.exports = (function() {
Utils._.extend(DAO.prototype, Mixin.prototype) Utils._.extend(DAO.prototype, Mixin.prototype)
Object.defineProperty(DAO.prototype, 'sequelize', { Object.defineProperty(DAO.prototype, 'sequelize', {
get: function(){ return this.__factory.daoFactoryManager.sequelize } get: function(){ return this.Model.daoFactoryManager.sequelize }
}) })
Object.defineProperty(DAO.prototype, 'QueryInterface', { Object.defineProperty(DAO.prototype, 'QueryInterface', {
...@@ -53,7 +53,7 @@ module.exports = (function() { ...@@ -53,7 +53,7 @@ module.exports = (function() {
var result = {} var result = {}
, self = this , self = this
Utils._.each(this.__factory.primaryKeys, function(_, attr) { Utils._.each(this.Model.primaryKeys, function(_, attr) {
result[attr] = self.dataValues[attr] result[attr] = self.dataValues[attr]
}) })
...@@ -63,14 +63,9 @@ module.exports = (function() { ...@@ -63,14 +63,9 @@ module.exports = (function() {
Object.defineProperty(DAO.prototype, "identifiers", { Object.defineProperty(DAO.prototype, "identifiers", {
get: function() { get: function() {
var primaryKeys = Object.keys(this.__factory.primaryKeys) var primaryKeys = Object.keys(this.Model.primaryKeys)
, result = {} , result = {}
, self = this , self = this
if (!this.__factory.hasPrimaryKeys) {
primaryKeys = ['id']
}
primaryKeys.forEach(function(identifier) { primaryKeys.forEach(function(identifier) {
result[identifier] = self.dataValues[identifier] result[identifier] = self.dataValues[identifier]
}) })
...@@ -163,28 +158,22 @@ module.exports = (function() { ...@@ -163,28 +158,22 @@ module.exports = (function() {
return return
} else { } else {
// If attempting to set primary key and primary key is already defined, return // If attempting to set primary key and primary key is already defined, return
if (this._hasPrimaryKeys && originalValue && this._isPrimaryKey(key)) { if (this.Model._hasPrimaryKeys && originalValue && this.Model._isPrimaryKey(key)) {
return
}
// If attempting to set generated id and id is already defined, return
// This is hack since generated id is not in primaryKeys, although it should be
if (originalValue && key === "id") {
return return
} }
// If attempting to set read only attributes, return // If attempting to set read only attributes, return
if (!options.raw && this._hasReadOnlyAttributes && this._isReadOnlyAttribute(key)) { if (!options.raw && this.Model._hasReadOnlyAttributes && this.Model._isReadOnlyAttribute(key)) {
return return
} }
// Convert boolean-ish values to booleans // Convert boolean-ish values to booleans
if (this._hasBooleanAttributes && this._isBooleanAttribute(key) && value !== null && value !== undefined) { if (this.Model._hasBooleanAttributes && this.Model._isBooleanAttribute(key) && value !== null && value !== undefined) {
value = !!value value = !!value
} }
// Convert date fields to real date objects // Convert date fields to real date objects
if (this._hasDateAttributes && this._isDateAttribute(key) && value !== null && !(value instanceof Date)) { if (this.Model._hasDateAttributes && this.Model._isDateAttribute(key) && value !== null && !(value instanceof Date)) {
value = new Date(value) value = new Date(value)
} }
...@@ -309,13 +298,13 @@ module.exports = (function() { ...@@ -309,13 +298,13 @@ module.exports = (function() {
} }
}) })
for (var attrName in self.daoFactory.rawAttributes) { for (var attrName in self.Model.rawAttributes) {
if (self.daoFactory.rawAttributes.hasOwnProperty(attrName)) { if (self.Model.rawAttributes.hasOwnProperty(attrName)) {
var definition = self.daoFactory.rawAttributes[attrName] var definition = self.Model.rawAttributes[attrName]
, isHstore = !!definition.type && !!definition.type.type && definition.type.type === DataTypes.HSTORE.type , isHstore = !!definition.type && !!definition.type.type && definition.type.type === DataTypes.HSTORE.type
, isEnum = definition.type && (definition.type.toString() === DataTypes.ENUM.toString()) , isEnum = definition.type && (definition.type.toString() === DataTypes.ENUM.toString())
, isMySQL = ['mysql', 'mariadb'].indexOf(self.daoFactory.daoFactoryManager.sequelize.options.dialect) !== -1 , isMySQL = ['mysql', 'mariadb'].indexOf(self.Model.daoFactoryManager.sequelize.options.dialect) !== -1
, ciCollation = !!self.daoFactory.options.collate && self.daoFactory.options.collate.match(/_ci$/i) , ciCollation = !!self.Model.options.collate && self.Model.options.collate.match(/_ci$/i)
, valueOutOfScope , valueOutOfScope
// Unfortunately for MySQL CI collation we need to map/lowercase values again // Unfortunately for MySQL CI collation we need to map/lowercase values again
...@@ -341,20 +330,20 @@ module.exports = (function() { ...@@ -341,20 +330,20 @@ module.exports = (function() {
values[updatedAtAttr] = ( values[updatedAtAttr] = (
( (
self.isNewRecord self.isNewRecord
&& !!self.daoFactory.rawAttributes[updatedAtAttr] && !!self.Model.rawAttributes[updatedAtAttr]
&& !!self.daoFactory.rawAttributes[updatedAtAttr].defaultValue && !!self.Model.rawAttributes[updatedAtAttr].defaultValue
) )
? self.daoFactory.rawAttributes[updatedAtAttr].defaultValue ? self.Model.rawAttributes[updatedAtAttr].defaultValue
: Utils.now(self.sequelize.options.dialect)) : Utils.now(self.sequelize.options.dialect))
} }
if (self.isNewRecord && createdAtAttr && !values[createdAtAttr]) { if (self.isNewRecord && createdAtAttr && !values[createdAtAttr]) {
values[createdAtAttr] = ( values[createdAtAttr] = (
( (
!!self.daoFactory.rawAttributes[createdAtAttr] !!self.Model.rawAttributes[createdAtAttr]
&& !!self.daoFactory.rawAttributes[createdAtAttr].defaultValue && !!self.Model.rawAttributes[createdAtAttr].defaultValue
) )
? self.daoFactory.rawAttributes[createdAtAttr].defaultValue ? self.Model.rawAttributes[createdAtAttr].defaultValue
: values[updatedAtAttr]) : values[updatedAtAttr])
} }
...@@ -364,7 +353,7 @@ module.exports = (function() { ...@@ -364,7 +353,7 @@ module.exports = (function() {
if (self.isNewRecord) { if (self.isNewRecord) {
query = 'insert' query = 'insert'
args = [self, self.QueryInterface.QueryGenerator.addSchema(self.__factory), values, options] args = [self, self.QueryInterface.QueryGenerator.addSchema(self.Model), values, options]
hook = 'Create' hook = 'Create'
} else { } else {
var identifier = self.__options.hasPrimaryKeys ? self.primaryKeyValues : { id: self.id } var identifier = self.__options.hasPrimaryKeys ? self.primaryKeyValues : { id: self.id }
...@@ -374,7 +363,7 @@ module.exports = (function() { ...@@ -374,7 +363,7 @@ module.exports = (function() {
} }
query = 'update' query = 'update'
args = [self, self.QueryInterface.QueryGenerator.addSchema(self.__factory), values, identifier, options] args = [self, self.QueryInterface.QueryGenerator.addSchema(self.Model), values, identifier, options]
hook = 'Update' hook = 'Update'
} }
...@@ -382,7 +371,7 @@ module.exports = (function() { ...@@ -382,7 +371,7 @@ module.exports = (function() {
self.dataValues = _.extend(self.dataValues, values) self.dataValues = _.extend(self.dataValues, values)
// Run the beforeCreate / beforeUpdate hook // Run the beforeCreate / beforeUpdate hook
self.__factory.runHooks('before' + hook, self, function(err) { self.Model.runHooks('before' + hook, self, function(err) {
if (!!err) { if (!!err) {
return emitter.emit('error', err) return emitter.emit('error', err)
} }
...@@ -405,7 +394,7 @@ module.exports = (function() { ...@@ -405,7 +394,7 @@ module.exports = (function() {
var fields = self.QueryInterface.QueryGenerator.uniqueConstraintMapping.map(err.toString()) var fields = self.QueryInterface.QueryGenerator.uniqueConstraintMapping.map(err.toString())
if (fields !== false) { if (fields !== false) {
fields = fields.filter(function(f) { return f !== self.daoFactory.tableName; }) fields = fields.filter(function(f) { return f !== self.Model.tableName; })
Utils._.each(self.__options.uniqueKeys, function(value, key) { Utils._.each(self.__options.uniqueKeys, function(value, key) {
if (Utils._.isEqual(value.fields, fields) && !!value.msg) { if (Utils._.isEqual(value.fields, fields) && !!value.msg) {
err = value.msg err = value.msg
...@@ -424,7 +413,7 @@ module.exports = (function() { ...@@ -424,7 +413,7 @@ module.exports = (function() {
result.dataValues = _.extend(result.dataValues, values) result.dataValues = _.extend(result.dataValues, values)
result._previousDataValues = _.clone(result.dataValues) result._previousDataValues = _.clone(result.dataValues)
self.__factory.runHooks('after' + hook, result, function(err) { self.Model.runHooks('after' + hook, result, function(err) {
if (!!err) { if (!!err) {
return emitter.emit('error', err) return emitter.emit('error', err)
} }
...@@ -445,12 +434,12 @@ module.exports = (function() { ...@@ -445,12 +434,12 @@ module.exports = (function() {
*/ */
DAO.prototype.reload = function(options) { DAO.prototype.reload = function(options) {
var where = [ var where = [
this.QueryInterface.quoteIdentifier(this.__factory.tableName) + '.' + this.QueryInterface.quoteIdentifier('id')+'=?', this.QueryInterface.quoteIdentifier(this.Model.tableName) + '.' + this.QueryInterface.quoteIdentifier('id')+'=?',
this.id this.id
] ]
return new Utils.CustomEventEmitter(function(emitter) { return new Utils.CustomEventEmitter(function(emitter) {
this.__factory.find({ this.Model.find({
where: where, where: where,
limit: 1, limit: 1,
include: this.options.include || null include: this.options.include || null
...@@ -506,7 +495,7 @@ module.exports = (function() { ...@@ -506,7 +495,7 @@ module.exports = (function() {
, query = null , query = null
return new Utils.CustomEventEmitter(function(emitter) { return new Utils.CustomEventEmitter(function(emitter) {
self.daoFactory.runHooks(self.daoFactory.options.hooks.beforeDestroy, self, function(err) { self.Model.runHooks(self.Model.options.hooks.beforeDestroy, self, function(err) {
if (!!err) { if (!!err) {
return emitter.emit('error', err) return emitter.emit('error', err)
} }
...@@ -516,7 +505,7 @@ module.exports = (function() { ...@@ -516,7 +505,7 @@ module.exports = (function() {
query = self.save(options) query = self.save(options)
} else { } else {
var identifier = self.__options.hasPrimaryKeys ? self.primaryKeyValues : { id: self.id }; var identifier = self.__options.hasPrimaryKeys ? self.primaryKeyValues : { id: self.id };
query = self.QueryInterface.delete(self, self.QueryInterface.QueryGenerator.addSchema(self.__factory.tableName, self.__factory.options.schema), identifier, options) query = self.QueryInterface.delete(self, self.QueryInterface.QueryGenerator.addSchema(self.Model.tableName, self.Model.options.schema), identifier, options)
} }
query.on('sql', function(sql) { query.on('sql', function(sql) {
...@@ -526,7 +515,7 @@ module.exports = (function() { ...@@ -526,7 +515,7 @@ module.exports = (function() {
emitter.emit('error', err) emitter.emit('error', err)
}) })
.success(function(results) { .success(function(results) {
self.daoFactory.runHooks(self.daoFactory.options.hooks.afterDestroy, self, function(err) { self.Model.runHooks(self.Model.options.hooks.afterDestroy, self, function(err) {
if (!!err) { if (!!err) {
return emitter.emit('error', err) return emitter.emit('error', err)
} }
...@@ -574,7 +563,7 @@ module.exports = (function() { ...@@ -574,7 +563,7 @@ module.exports = (function() {
countOrOptions.attributes[updatedAtAttr] = Utils.now(this.daoFactory.daoFactoryManager.sequelize.options.dialect) countOrOptions.attributes[updatedAtAttr] = Utils.now(this.daoFactory.daoFactoryManager.sequelize.options.dialect)
} }
return this.QueryInterface.increment(this, this.QueryInterface.QueryGenerator.addSchema(this.__factory.tableName, this.__factory.options.schema), values, identifier, countOrOptions) return this.QueryInterface.increment(this, this.QueryInterface.QueryGenerator.addSchema(this.Model.tableName, this.Model.options.schema), values, identifier, countOrOptions)
} }
DAO.prototype.decrement = function (fields, countOrOptions) { DAO.prototype.decrement = function (fields, countOrOptions) {
...@@ -639,7 +628,7 @@ module.exports = (function() { ...@@ -639,7 +628,7 @@ module.exports = (function() {
// private // private
var initValues = function(values, options) { var initValues = function(values, options) {
// set id to null if not passed as value, a newly created dao has no id // set id to null if not passed as value, a newly created dao has no id
var defaults = this.hasPrimaryKeys ? {} : { id: null }, var defaults = {},
key; key;
values = values && _.clone(values) || {} values = values && _.clone(values) || {}
......
test/dao/values.test.js
...@@ -208,7 +208,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () { ...@@ -208,7 +208,7 @@ describe(Support.getTestDialectTeaser("DAO"), function () {
var product = Product.build({ var product = Product.build({
price: 10 price: 10
}) })
expect(product.toJSON()).to.deep.equal({withTaxes: 1250, price: 1000, id: null}) expect(product.toJSON()).to.deep.equal({withTaxes: 1250, price: 1000})
}) })
it('should work with save', function (done) { it('should work with save', function (done) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!