Skip to content

public / sequelize

Go to a project

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

Commit d170b5da by Mick Hansen
Options

Merge pull request #2990 from janmeier/rawquery 

Revamped raw query handling
2 parents 52916fb8 67762ac6
Inline Side-by-side
Showing with 473 additions and 449 deletions
.gitignore
...@@ -7,5 +7,6 @@ npm-debug.log ...@@ -7,5 +7,6 @@ npm-debug.log
*~ *~
test/binary/tmp/* test/binary/tmp/*
test/tmp/* test/tmp/*
test/dialects/sqlite/test.sqlite
test/sqlite/test.sqlite test/sqlite/test.sqlite
coverage-* coverage-*
changelog.md
# Next # Next
- [BUG] Fixed `field` support for `increment` and `decrement`. - [BUG] Fixed `field` support for `increment` and `decrement`.
- [FEATURE/BUG] Raw queries always return all results (including affected rows etc). This means you should change all promise listeners on `sequelize.query` to use `.spread` instead of `.then`, unless you are passing a query type.
#### Backwards compatability changes
- The default query type for `sequelize.query` is now `RAW` - this means that two arguments (results and metadata) will be returned by default and you should use `.spread`
- The 4th argument to `sequelize.query` has been deprecated in favor of `options.replacements`
# 2.0.0-rc8 # 2.0.0-rc8
- [FEATURE] CLS Support. CLS is also used to automatically pass the transaction to any calls within the callback chain when using `sequelize.transaction(function() ...`. - [FEATURE] CLS Support. CLS is also used to automatically pass the transaction to any calls within the callback chain when using `sequelize.transaction(function() ...`.
......
docs/docs/raw-queries.md 0 → 100644
As there are often use cases in which it is just easier to execute raw / already prepared SQL queries, you can utilize the function `sequelize.query`.
By default the function will return two arguments - a results array, and an object containing metadata (affected rows etc.). Note that since this is a raw query, the metadata (property names etc.) is dialect specific. Some dialects return the metadata "within" the results object (as properties on an array). However, two arguments will always be returned, but for MSSQL and MySQL it will be two references to the same object.
```js
sequelize.query("UPDATE users SET y = 42 WHERE x = 12").spread(function(results, metadata) {
// Results will be an empty array and metadata will contain the number of affected rows.
})
```
In cases where you don't need to access the metadata you can pass in a query type to tell sequelize how to format the results. For example, for a simple select query you could do:
```js
sequelize.query("SELECT * FROM `users`", { type: sequelize.QueryTypes.SELECT})
.then(function(users) {
// We don't need spread here, since only the results will be returned for select queries
})
```
Several other query types are available. [Peek into the source for details](https://github.com/sequelize/sequelize/blob/master/lib/query-types.js)
A second, optional, argument is the _callee_, which is a model. If you pass a model the returned data will be instances of that model.
```js
// Callee is the model definition. This allows you to easily map a query to a predefined model
sequelize.query('SELECT * FROM projects', Projects).then(function(projects){
// Each record will now be a instance of Project
})
```
# Replacements
Replacements in a query can be done in two different ways, either using named parameters (starting with `:`), or unnamed, represented by a `?`. Replacements are passed in the options object.
* If an array is passed, `?` will be replaced in the order that they appear in the array
* If an object is passed, `:key` will be replaced with the keys from that object. If the object contains keys not found in the query or vice verca, an exception will be thrown.
```js
sequelize.query('SELECT * FROM projects WHERE status = ?',
{ replacements: ['active'], type: sequelize.QueryTypes.SELECT }
).then(function(projects) {
console.log(projects)
})
sequelize.query('SELECT * FROM projects WHERE status = :status ',
{ replacements: { status: 'active', type: sequelize.QueryTypes.SELECT }}
).then(function(projects) {
console.log(projects)
})
```
docs/docs/usage.md
...@@ -225,9 +225,9 @@ var sequelize = new Sequelize('database', 'username', 'password', { ...@@ -225,9 +225,9 @@ var sequelize = new Sequelize('database', 'username', 'password', {
## Executing raw SQL queries ## Executing raw SQL queries
As there are often use cases in which it is just easier to execute raw / already prepared SQL queries, you can utilize the function`sequelize.query`. As there are often use cases in which it is just easier to execute raw / already prepared SQL queries, you can utilize the function `sequelize.query`.
Here is how it works: Here is how it works:
```js ```js
// Arguments for raw queries // Arguments for raw queries
...@@ -324,4 +324,4 @@ sequelize.query('select 1 as `foo.bar.baz`').success(function(rows) { ...@@ -324,4 +324,4 @@ sequelize.query('select 1 as `foo.bar.baz`').success(function(rows) {
[0]: /docs/latest/usage#options [0]: /docs/latest/usage#options
\ No newline at end of file
lib/dialects/abstract/query.js
...@@ -83,6 +83,10 @@ module.exports = (function() { ...@@ -83,6 +83,10 @@ module.exports = (function() {
} }
}; };
AbstractQuery.prototype.isRawQuery = function () {
return this.options.type === QueryTypes.RAW;
};
AbstractQuery.prototype.isVersionQuery = function () { AbstractQuery.prototype.isVersionQuery = function () {
return this.options.type === QueryTypes.VERSION; return this.options.type === QueryTypes.VERSION;
}; };
...@@ -137,6 +141,10 @@ module.exports = (function() { ...@@ -137,6 +141,10 @@ module.exports = (function() {
return this.options.type === QueryTypes.SHOWINDEXES; return this.options.type === QueryTypes.SHOWINDEXES;
}; };
AbstractQuery.prototype.isDescribeQuery = function () {
return this.options.type === QueryTypes.DESCRIBE;
};
AbstractQuery.prototype.isSelectQuery = function() { AbstractQuery.prototype.isSelectQuery = function() {
return this.options.type === QueryTypes.SELECT; return this.options.type === QueryTypes.SELECT;
}; };
...@@ -149,7 +157,15 @@ module.exports = (function() { ...@@ -149,7 +157,15 @@ module.exports = (function() {
return this.options.type === QueryTypes.BULKDELETE; return this.options.type === QueryTypes.BULKDELETE;
}; };
AbstractQuery.prototype.isForeignKeysQuery = function() {
return this.options.type === QueryTypes.FOREIGNKEYS;
};
AbstractQuery.prototype.isUpdateQuery = function() { AbstractQuery.prototype.isUpdateQuery = function() {
if (this.options.type === QueryTypes.UPDATE) {
return true;
}
return (this.sql.toLowerCase().indexOf('update') === 0); return (this.sql.toLowerCase().indexOf('update') === 0);
}; };
...@@ -167,15 +183,12 @@ module.exports = (function() { ...@@ -167,15 +183,12 @@ module.exports = (function() {
} }
} }
return o; if (this.options.nest) {
}); o = Dot.transform(o);
}
if (this.options.nest) {
result = result.map(function(entry){
return Dot.transform(entry);
});
}
return o;
}, this);
// Queries with include // Queries with include
} else if (this.options.hasJoin === true) { } else if (this.options.hasJoin === true) {
results = groupJoinData(results, { results = groupJoinData(results, {
......
lib/dialects/mssql/query.js
...@@ -129,23 +129,20 @@ module.exports = (function() { ...@@ -129,23 +129,20 @@ module.exports = (function() {
if (this.isShowTablesQuery()) { if (this.isShowTablesQuery()) {
result = this.handleShowTablesQuery(data); result = this.handleShowTablesQuery(data);
} else if (this.isShowOrDescribeQuery()) { } else if (this.isDescribeQuery()) {
result = data; result = {};
if (this.sql.toLowerCase().indexOf("select c.column_name as 'name', c.data_type as 'type', c.is_nullable as 'isnull'") === 0) { data.forEach(function(_result) {
result = {}; if (_result.Default)
data.forEach(function(_result) { _result.Default = _result.Default.replace('(\'','').replace('\')','').replace(/'/g,'');
if (_result.Default)
_result.Default = _result.Default.replace('(\'','').replace('\')','').replace(/'/g,''); result[_result.Name] = {
type: _result.Type.toUpperCase(),
result[_result.Name] = { allowNull: (_result.IsNull === 'YES' ? true : false),
type: _result.Type.toUpperCase(), defaultValue: _result.Default
allowNull: (_result.IsNull === 'YES' ? true : false), };
defaultValue: _result.Default });
}; } else if (this.isShowIndexesQuery()) {
}); result = this.handleShowIndexesQuery(data);
} else if (this.isShowIndexesQuery()) {
result = this.handleShowIndexesQuery(data);
}
} else if (this.isSelectQuery()) { } else if (this.isSelectQuery()) {
result = this.handleSelectQuery(data); result = this.handleSelectQuery(data);
} else if (this.isCallQuery()) { } else if (this.isCallQuery()) {
...@@ -156,7 +153,12 @@ module.exports = (function() { ...@@ -156,7 +153,12 @@ module.exports = (function() {
result = data[0] && data[0].AFFECTEDROWS; result = data[0] && data[0].AFFECTEDROWS;
} else if (this.isVersionQuery()) { } else if (this.isVersionQuery()) {
result = data[0].version; result = data[0].version;
} } else if (this.isForeignKeysQuery()) {
result = data;
} else if (this.isRawQuery()) {
// MSSQL returns row data and metadata (affected rows etc) in a single object - let's standarize it, sorta
result = [data, data];
}
return result; return result;
}; };
......
lib/dialects/mysql/query.js
...@@ -76,28 +76,30 @@ module.exports = (function() { ...@@ -76,28 +76,30 @@ module.exports = (function() {
result = this.handleSelectQuery(data); result = this.handleSelectQuery(data);
} else if (this.isShowTablesQuery()) { } else if (this.isShowTablesQuery()) {
result = this.handleShowTablesQuery(data); result = this.handleShowTablesQuery(data);
} else if (this.isShowOrDescribeQuery()) { } else if (this.isDescribeQuery()) {
result = data; result = {};
if (this.sql.toLowerCase().indexOf('describe') === 0) { data.forEach(function(_result) {
result = {}; result[_result.Field] = {
type: _result.Type.toUpperCase(),
allowNull: (_result.Null === 'YES'),
defaultValue: _result.Default
};
});
} else if (this.isShowIndexesQuery()) {
result = this.handleShowIndexesQuery(data);
data.forEach(function(_result) {
result[_result.Field] = {
type: _result.Type.toUpperCase(),
allowNull: (_result.Null === 'YES'),
defaultValue: _result.Default
};
});
} else if (this.isShowIndexesQuery()) {
result = this.handleShowIndexesQuery(data);
}
} else if (this.isCallQuery()) { } else if (this.isCallQuery()) {
result = data[0]; result = data[0];
} else if (this.isBulkUpdateQuery() || this.isBulkDeleteQuery() || this.isUpsertQuery()) { } else if (this.isBulkUpdateQuery() || this.isBulkDeleteQuery() || this.isUpsertQuery()) {
result = data.affectedRows; result = data.affectedRows;
} else if (this.isVersionQuery()) { } else if (this.isVersionQuery()) {
result = data[0].version; result = data[0].version;
} else if (this.isForeignKeysQuery()) {
result = data;
} else if (this.isRawQuery()) {
// MySQL returns row data and metadata (affected rows etc) in a single object - let's standarize it, sorta
result = [data, data];
} }
return result; return result;
......
lib/dialects/postgres/query-generator.js
...@@ -869,8 +869,6 @@ module.exports = (function() { ...@@ -869,8 +869,6 @@ module.exports = (function() {
return dataType; return dataType;
}, },
quoteIdentifier: function(identifier, force) { quoteIdentifier: function(identifier, force) {
var _ = Utils._; var _ = Utils._;
if (identifier === '*') return identifier; if (identifier === '*') return identifier;
......
lib/dialects/postgres/query.js
...@@ -147,62 +147,60 @@ module.exports = (function() { ...@@ -147,62 +147,60 @@ module.exports = (function() {
}); });
return result; return result;
} else if (self.isSelectQuery()) { } else if (self.isSelectQuery()) {
if (self.sql.toLowerCase().indexOf('select c.column_name') === 0) { // Postgres will treat tables as case-insensitive, so fix the case
result = {}; // of the returned values to match attributes
if (self.options.raw === false && self.sequelize.options.quoteIdentifiers === false) {
rows.forEach(function(_result) { var attrsMap = Utils._.reduce(self.callee.attributes, function(m, v, k) { m[k.toLowerCase()] = k; return m; }, {});
result[_result.Field] = { rows.forEach(function(row) {
type: _result.Type.toUpperCase(), Utils._.keys(row).forEach(function(key) {
allowNull: (_result.Null === 'YES'), var targetAttr = attrsMap[key];
defaultValue: _result.Default, if (targetAttr !== key) {
special: (!!_result.special ? self.sequelize.queryInterface.QueryGenerator.fromArray(_result.special) : []) row[targetAttr] = row[key];
}; delete row[key];
}
});
});
}
if (result[_result.Field].type === 'BOOLEAN') { if (!!self.callee && !!self.callee._hasHstoreAttributes) {
result[_result.Field].defaultValue = { 'false': false, 'true': true }[result[_result.Field].defaultValue]; rows.forEach(function(row) {
parseHstoreFields(self.callee, row);
});
}
if (result[_result.Field].defaultValue === undefined) { return self.handleSelectQuery(rows);
result[_result.Field].defaultValue = null; } else if (QueryTypes.DESCRIBE === self.options.type) {
} result = {};
rows.forEach(function(_result) {
result[_result.Field] = {
type: _result.Type.toUpperCase(),
allowNull: (_result.Null === 'YES'),
defaultValue: _result.Default,
special: (!!_result.special ? self.sequelize.queryInterface.QueryGenerator.fromArray(_result.special) : [])
};
if (result[_result.Field].type === 'BOOLEAN') {
result[_result.Field].defaultValue = { 'false': false, 'true': true }[result[_result.Field].defaultValue];
if (result[_result.Field].defaultValue === undefined) {
result[_result.Field].defaultValue = null;
} }
}
if (typeof result[_result.Field].defaultValue === 'string') { if (typeof result[_result.Field].defaultValue === 'string') {
result[_result.Field].defaultValue = result[_result.Field].defaultValue.replace(/'/g, ''); result[_result.Field].defaultValue = result[_result.Field].defaultValue.replace(/'/g, '');
if (result[_result.Field].defaultValue.indexOf('::') > -1) { if (result[_result.Field].defaultValue.indexOf('::') > -1) {
var split = result[_result.Field].defaultValue.split('::'); var split = result[_result.Field].defaultValue.split('::');
if (split[1].toLowerCase() !== 'regclass)') { if (split[1].toLowerCase() !== 'regclass)') {
result[_result.Field].defaultValue = split[0]; result[_result.Field].defaultValue = split[0];
}
} }
} }
});
return result;
} else {
// Postgres will treat tables as case-insensitive, so fix the case
// of the returned values to match attributes
if (self.options.raw === false && self.sequelize.options.quoteIdentifiers === false) {
var attrsMap = Utils._.reduce(self.callee.attributes, function(m, v, k) { m[k.toLowerCase()] = k; return m; }, {});
rows.forEach(function(row) {
Utils._.keys(row).forEach(function(key) {
var targetAttr = attrsMap[key];
if (targetAttr !== key) {
row[targetAttr] = row[key];
delete row[key];
}
});
});
}
if (!!self.callee && !!self.callee._hasHstoreAttributes) {
rows.forEach(function(row) {
parseHstoreFields(self.callee, row);
});
} }
});
return self.handleSelectQuery(rows); return result;
}
} else if (self.isShowOrDescribeQuery()) { } else if (self.isShowOrDescribeQuery()) {
return results; return results;
} else if (QueryTypes.BULKUPDATE === self.options.type) { } else if (QueryTypes.BULKUPDATE === self.options.type) {
...@@ -243,6 +241,8 @@ module.exports = (function() { ...@@ -243,6 +241,8 @@ module.exports = (function() {
return self.callee || (rows && ((self.options.plain && rows[0]) || rows)) || undefined; return self.callee || (rows && ((self.options.plain && rows[0]) || rows)) || undefined;
} else if (self.isVersionQuery()) { } else if (self.isVersionQuery()) {
return results[0].version; return results[0].version;
} else if (self.isRawQuery()) {
return [rows, result];
} else { } else {
return results; return results;
} }
......
lib/dialects/sqlite/query.js
...@@ -139,6 +139,8 @@ module.exports = (function() { ...@@ -139,6 +139,8 @@ module.exports = (function() {
result = undefined; result = undefined;
} else if (self.options.type === QueryTypes.VERSION) { } else if (self.options.type === QueryTypes.VERSION) {
result = results[0].version; result = results[0].version;
} else if (self.options.type === QueryTypes.RAW) {
result = [results, metaData];
} }
resolve(result); resolve(result);
......
lib/instance.js
...@@ -831,7 +831,7 @@ module.exports = (function() { ...@@ -831,7 +831,7 @@ module.exports = (function() {
* @param {Integer} [options.by=1] The number to increment by * @param {Integer} [options.by=1] The number to increment by
* @param {Transaction} [options.transaction] * @param {Transaction} [options.transaction]
* *
* @return {Promise} * @return {Promise<this>}
*/ */
Instance.prototype.increment = function(fields, countOrOptions) { Instance.prototype.increment = function(fields, countOrOptions) {
Utils.validateParameter(countOrOptions, Object, { Utils.validateParameter(countOrOptions, Object, {
...@@ -895,7 +895,7 @@ module.exports = (function() { ...@@ -895,7 +895,7 @@ module.exports = (function() {
} }
}, this); }, this);
return this.QueryInterface.increment(this, this.Model.getTableName(countOrOptions), values, where, countOrOptions); return this.QueryInterface.increment(this, this.Model.getTableName(countOrOptions), values, where, countOrOptions).return(this);
}; };
/** /**
......
lib/model.js
...@@ -725,7 +725,6 @@ module.exports = (function() { ...@@ -725,7 +725,6 @@ module.exports = (function() {
} }
}).then(function() { }).then(function() {
return this.QueryInterface.select(this, this.getTableName(options), options, Utils._.defaults({ return this.QueryInterface.select(this, this.getTableName(options), options, Utils._.defaults({
type: QueryTypes.SELECT,
hasJoin: hasJoin, hasJoin: hasJoin,
tableNames: Object.keys(tableNames) tableNames: Object.keys(tableNames)
}, queryOptions, { transaction: options.transaction })); }, queryOptions, { transaction: options.transaction }));
...@@ -743,9 +742,7 @@ module.exports = (function() { ...@@ -743,9 +742,7 @@ module.exports = (function() {
// whereCollection is used for non-primary key updates // whereCollection is used for non-primary key updates
this.options.whereCollection = options.where || null; this.options.whereCollection = options.where || null;
return this.QueryInterface.select(this, [[this.getTableName(options), this.name], joinTableName], options, Utils._.defaults({ return this.QueryInterface.select(this, [[this.getTableName(options), this.name], joinTableName], options, Utils._.defaults(queryOptions, { transaction: (options || {}).transaction }));
type: QueryTypes.SELECT
}, queryOptions, { transaction: (options || {}).transaction }));
}; };
/** /**
...@@ -1449,7 +1446,6 @@ module.exports = (function() { ...@@ -1449,7 +1446,6 @@ module.exports = (function() {
options.type = QueryTypes.BULKDELETE; options.type = QueryTypes.BULKDELETE;
mapFieldNames.call(this, options, this); mapFieldNames.call(this, options, this);
return Promise.try(function() { return Promise.try(function() {
......
lib/query-interface.js
...@@ -46,12 +46,13 @@ module.exports = (function() { ...@@ -46,12 +46,13 @@ module.exports = (function() {
var self = this; var self = this;
options = Utils._.extend({ options = Utils._.extend({
raw: true raw: true,
type: this.sequelize.QueryTypes.SELECT
}, options || {}); }, options || {});
var showSchemasSql = self.QueryGenerator.showSchemasQuery(); var showSchemasSql = self.QueryGenerator.showSchemasQuery();
return this.sequelize.query(showSchemasSql, null, options).then(function(schemaNames) { return this.sequelize.query(showSchemasSql, options).then(function(schemaNames) {
return Utils._.flatten( return Utils._.flatten(
Utils._.map(schemaNames, function(value) { Utils._.map(schemaNames, function(value) {
return (!!value.schema_name ? value.schema_name : value); return (!!value.schema_name ? value.schema_name : value);
...@@ -83,7 +84,7 @@ module.exports = (function() { ...@@ -83,7 +84,7 @@ module.exports = (function() {
}); });
options = Utils._.extend({ options = Utils._.extend({
logging: this.sequelize.options.logging logging: this.sequelize.options.logging,
}, options || {}); }, options || {});
// Postgres requires a special SQL command for enums // Postgres requires a special SQL command for enums
...@@ -317,7 +318,7 @@ module.exports = (function() { ...@@ -317,7 +318,7 @@ module.exports = (function() {
var sql = this.QueryGenerator.describeTableQuery(tableName, schema, schemaDelimiter); var sql = this.QueryGenerator.describeTableQuery(tableName, schema, schemaDelimiter);
return this.sequelize.query(sql, null, { raw: true }).then(function(data) { return this.sequelize.query(sql, { type: QueryTypes.DESCRIBE }).then(function(data) {
// If no data is returned from the query, then the table name may be wrong. // If no data is returned from the query, then the table name may be wrong.
// Query generators that use information_schema for retrieving table info will just return an empty result set, // Query generators that use information_schema for retrieving table info will just return an empty result set,
// it will not throw an error like built-ins do (e.g. DESCRIBE on MySql). // it will not throw an error like built-ins do (e.g. DESCRIBE on MySql).
...@@ -443,7 +444,7 @@ module.exports = (function() { ...@@ -443,7 +444,7 @@ module.exports = (function() {
} }
return Utils.Promise.map(tableNames, function(tableName) { return Utils.Promise.map(tableNames, function(tableName) {
return self.sequelize.query(self.QueryGenerator.getForeignKeysQuery(tableName, self.sequelize.config.database)); return self.sequelize.query(self.QueryGenerator.getForeignKeysQuery(tableName, self.sequelize.config.database)).get(0);
}).then(function(results) { }).then(function(results) {
var result = {}; var result = {};
...@@ -556,6 +557,9 @@ module.exports = (function() { ...@@ -556,6 +557,9 @@ module.exports = (function() {
, restrict = false , restrict = false
, sql = self.QueryGenerator.updateQuery(tableName, values, identifier, options, dao.Model.rawAttributes); , sql = self.QueryGenerator.updateQuery(tableName, values, identifier, options, dao.Model.rawAttributes);
options = options || {};
options.type = QueryTypes.UPDATE;
// Check for a restrict field // Check for a restrict field
if (!!dao.Model && !!dao.Model.associations) { if (!!dao.Model && !!dao.Model.associations) {
var keys = Object.keys(dao.Model.associations) var keys = Object.keys(dao.Model.associations)
...@@ -689,13 +693,14 @@ module.exports = (function() { ...@@ -689,13 +693,14 @@ module.exports = (function() {
var sql = this.QueryGenerator.selectQuery(tableName, options, model); var sql = this.QueryGenerator.selectQuery(tableName, options, model);
queryOptions = Utils._.extend({}, queryOptions, { queryOptions = Utils._.extend({}, queryOptions, {
type: QueryTypes.SELECT,
include: options.include, include: options.include,
includeNames: options.includeNames, includeNames: options.includeNames,
includeMap: options.includeMap, includeMap: options.includeMap,
hasSingleAssociation: options.hasSingleAssociation, hasSingleAssociation: options.hasSingleAssociation,
hasMultiAssociation: options.hasMultiAssociation, hasMultiAssociation: options.hasMultiAssociation,
attributes: options.attributes, attributes: options.attributes,
originalAttributes: options.originalAttributes originalAttributes: options.originalAttributes,
}); });
return this.sequelize.query(sql, model, queryOptions); return this.sequelize.query(sql, model, queryOptions);
......
lib/query-types.js
...@@ -3,10 +3,14 @@ ...@@ -3,10 +3,14 @@
module.exports = { module.exports = {
SELECT: 'SELECT', SELECT: 'SELECT',
INSERT: 'INSERT', INSERT: 'INSERT',
UPDATE: 'UPDATE',
BULKUPDATE: 'BULKUPDATE', BULKUPDATE: 'BULKUPDATE',
BULKDELETE: 'BULKDELETE', BULKDELETE: 'BULKDELETE',
UPSERT: 'UPSERT', UPSERT: 'UPSERT',
VERSION: 'VERSION', VERSION: 'VERSION',
SHOWTABLES: 'SHOWTABLES', SHOWTABLES: 'SHOWTABLES',
SHOWINDEXES: 'SHOWINDEXES' SHOWINDEXES: 'SHOWINDEXES',
DESCRIBE: 'DESCRIBE',
RAW: 'RAW',
FOREIGNKEYS: 'FOREIGNKEYS',
}; };
lib/sequelize.js
...@@ -227,7 +227,11 @@ module.exports = (function() { ...@@ -227,7 +227,11 @@ module.exports = (function() {
*/ */
Sequelize.prototype.Promise = Sequelize.Promise = Promise; Sequelize.prototype.Promise = Sequelize.Promise = Promise;
Sequelize.QueryTypes = QueryTypes; /**
* Available query types for use with `sequelize.query`
* @property QueryTypes
*/
Sequelize.prototype.QueryTypes = Sequelize.QueryTypes = QueryTypes;
/** /**
* Exposes the validator.js object, so you can extend it with custom validation functions. The validator is exposed both on the instance, and on the constructor. * Exposes the validator.js object, so you can extend it with custom validation functions. The validator is exposed both on the instance, and on the constructor.
...@@ -624,17 +628,31 @@ module.exports = (function() { ...@@ -624,17 +628,31 @@ module.exports = (function() {
/** /**
* Execute a query on the DB, with the posibility to bypass all the sequelize goodness. * Execute a query on the DB, with the posibility to bypass all the sequelize goodness.
* *
* If you do not provide other arguments than the SQL, raw will be assumed to the true, and sequelize will not try to do any formatting to the results of the query. * By default, the function will return two arguments: an array of results, and a metadata object, containing number of affected rows etc. Use `.spread` to access the results.
*
* If you are running a type of query where you don't need the metadata, for example a `SELECT` query, you can pass in a query type to make sequelize format the results:
*
* ```js
* sequlize.query('SELECT...').spread(function (results, metadata) {
* // Raw query - use spread
* });
*
* sequlize.query('SELECT...', { type: sequelize.QueryTypes.SELECT }).then(function (results) {
* // SELECT query - use then
* })
* ```
* *
* @method query * @method query
* @param {String} sql * @param {String} sql
* @param {Instance} [callee] If callee is provided, the returned data will be put into the callee * @param {Instance|Model} [callee] If callee is provided, the returned data will be put into the callee
* @param {Object} [options={}] Query options. * @param {Object} [options={}] Query options.
* @param {Boolean} [options.raw] If true, sequelize will not try to format the results of the query, or build an instance of a model from the result * @param {Boolean} [options.raw] If true, sequelize will not try to format the results of the query, or build an instance of a model from the result
* @param {Transaction} [options.transaction] The transaction that the query should be executed under * @param {Transaction} [options.transaction=null] The transaction that the query should be executed under
* @param {String} [options.type='SELECT'] The type of query you are executing. The query type affects how results are formatted before they are passed back. If no type is provided sequelize will try to guess the right type based on the sql, and fall back to SELECT. The type is a string, but `Sequelize.QueryTypes` is provided is convenience shortcuts. Current options are SELECT, BULKUPDATE and BULKDELETE * @param {String} [options.type='RAW'] The type of query you are executing. The query type affects how results are formatted before they are passed back. The type is a string, but `Sequelize.QueryTypes` is provided as convenience shortcuts.
* @param {Boolean} [options.nest=false] If true, transforms objects with `.` separated property names into nested objects using [dottie.js](https://github.com/mickhansen/dottie.js). For example { 'user.username': 'john' } becomes { user: { username: 'john' }} * @param {Boolean} [options.nest=false] If true, transforms objects with `.` separated property names into nested objects using [dottie.js](https://github.com/mickhansen/dottie.js). For example { 'user.username': 'john' } becomes { user: { username: 'john' }}. When `nest` is true, the query type is assumed to be `'SELECT'`, unless otherwise specified
* @param {Object|Array} [replacements] Either an object of named parameter replacements in the format `:param` or an array of unnamed replacements to replace `?` in your SQL. * @param {Boolean} [options.plain=false] Sets the query type to `SELECT` and return a single row
* @param {Object|Array} [options.replacements] Either an object of named parameter replacements in the format `:param` or an array of unnamed replacements to replace `?` in your SQL.
*
* @return {Promise} * @return {Promise}
* *
* @see {Model#build} for more information about callee. * @see {Model#build} for more information about callee.
...@@ -643,30 +661,52 @@ module.exports = (function() { ...@@ -643,30 +661,52 @@ module.exports = (function() {
var self = this; var self = this;
sql = sql.trim(); sql = sql.trim();
if (arguments.length === 4) { if (arguments.length === 4) {
if (Array.isArray(replacements)) { deprecated('passing raw query replacements as the 4th argument to sequelize.query is deprecated. Please use options.replacements instead');
sql = Utils.format([sql].concat(replacements), this.options.dialect); options.replacements = replacements;
}
else {
sql = Utils.formatNamedParameters(sql, replacements, this.options.dialect);
}
} else if (arguments.length === 3) { } else if (arguments.length === 3) {
options = options; options = options;
} else if (arguments.length === 2) { } else if (arguments.length === 2) {
options = {}; if (callee instanceof Sequelize.Model) {
options = {};
} else {
options = callee;
callee = undefined;
}
} else { } else {
options = { raw: true }; options = { raw: true };
} }
if (!(callee instanceof Sequelize.Model)) {
// When callee is not set, assume raw query
options.raw = true;
}
if (options.replacements) {
if (Array.isArray(options.replacements)) {
sql = Utils.format([sql].concat(options.replacements), this.options.dialect);
}
else {
sql = Utils.formatNamedParameters(sql, options.replacements, this.options.dialect);
}
}
options = Utils._.extend(Utils._.clone(this.options.query), options); options = Utils._.extend(Utils._.clone(this.options.query), options);
options = Utils._.defaults(options, { options = Utils._.defaults(options, {
logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log, logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log
type: (sql.toLowerCase().indexOf('select') === 0) ? QueryTypes.SELECT : false
}); });
if (options.transaction === undefined && Sequelize.cls) { if (options.transaction === undefined && Sequelize.cls) {
options.transaction = Sequelize.cls.get('transaction'); options.transaction = Sequelize.cls.get('transaction');
} }
if (!options.type) {
if (options.nest || options.plain) {
options.type = QueryTypes.SELECT;
} else {
options.type = QueryTypes.RAW;
}
}
if (options.transaction && options.transaction.finished) { if (options.transaction && options.transaction.finished) {
return Promise.reject(options.transaction.finished+' has been called on this transaction, you can no longer use it'); return Promise.reject(options.transaction.finished+' has been called on this transaction, you can no longer use it');
} }
......
mkdocs.yml
...@@ -19,6 +19,7 @@ pages: ...@@ -19,6 +19,7 @@ pages:
- ['docs/hooks.md', 'Documentation', 'Hooks'] - ['docs/hooks.md', 'Documentation', 'Hooks']
- ['docs/transactions.md', 'Documentation', 'Transactions'] - ['docs/transactions.md', 'Documentation', 'Transactions']
- ['docs/legacy.md', 'Documentation', 'Working with legacy tables'] - ['docs/legacy.md', 'Documentation', 'Working with legacy tables']
- ['docs/raw-queries.md', 'Documentation', 'Raw queries']
- ['docs/migrations.md', 'Documentation', 'Migrations'] - ['docs/migrations.md', 'Documentation', 'Migrations']
- ['api/sequelize.md', 'API', 'Sequelize'] - ['api/sequelize.md', 'API', 'Sequelize']
...@@ -29,4 +30,4 @@ pages: ...@@ -29,4 +30,4 @@ pages:
- ['api/promise.md', 'API', 'Promise'] - ['api/promise.md', 'API', 'Promise']
- ['api/transaction.md', 'API', 'Transaction'] - ['api/transaction.md', 'API', 'Transaction']
- ['api/datatypes.md', 'API', 'Datatypes'] - ['api/datatypes.md', 'API', 'Datatypes']
- ['api/errors.md', 'API', 'Errors'] - ['api/errors.md', 'API', 'Errors']
\ No newline at end of file
test/integration/dialects/mysql/connector-manager.test.js
...@@ -34,24 +34,21 @@ if (Support.dialectIsMySQL()) { ...@@ -34,24 +34,21 @@ if (Support.dialectIsMySQL()) {
}); });
}); });
it('accepts new queries after shutting down a connection', function(done) { it('accepts new queries after shutting down a connection', function() {
// Create a sequelize instance with pooling disabled // Create a sequelize instance with pooling disabled
var sequelize = Support.createSequelizeInstance({ pool: false }); var sequelize = Support.createSequelizeInstance({ pool: false });
var User = sequelize.define('User', { username: DataTypes.STRING }); var User = sequelize.define('User', { username: DataTypes.STRING });
User.sync({force: true}).on('success', function() { return User.sync({force: true}).then(function() {
User.create({username: 'user1'}).on('success', function() { return User.create({username: 'user1'});
// After 100 ms the DB connection will be disconnected for inactivity }).then(function() {
setTimeout(function() { // After 100 ms the DB connection will be disconnected for inactivity
// This query will be queued just after the `client.end` is executed and before its callback is called return sequelize.Promise.delay(100);
sequelize.query('SELECT COUNT(*) AS count FROM Users').on('success', function(count) { }).then(function () {
expect(count[0].count).to.equal(1); // This query will be queued just after the `client.end` is executed and before its callback is called
done(); return sequelize.query('SELECT COUNT(*) AS count FROM Users', { type: sequelize.QueryTypes.SELECT });
}).error(function(error) { }).then(function(count) {
expect(error).to.not.exist; expect(count[0].count).to.equal(1);
});
}, 100);
});
}); });
}); });
......
test/integration/model.test.js
...@@ -18,7 +18,7 @@ chai.use(datetime); ...@@ -18,7 +18,7 @@ chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
beforeEach(function(done) { beforeEach(function() {
this.User = this.sequelize.define('User', { this.User = this.sequelize.define('User', {
username: DataTypes.STRING, username: DataTypes.STRING,
secretValue: DataTypes.STRING, secretValue: DataTypes.STRING,
...@@ -28,25 +28,21 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -28,25 +28,21 @@ describe(Support.getTestDialectTeaser('Model'), function() {
aBool: DataTypes.BOOLEAN aBool: DataTypes.BOOLEAN
}); });
this.User.sync({ force: true }).success(function() { return this.User.sync({ force: true });
done();
});
}); });
describe('constructor', function() { describe('constructor', function() {
it('uses the passed dao name as tablename if freezeTableName', function(done) { it('uses the passed dao name as tablename if freezeTableName', function() {
var User = this.sequelize.define('FrozenUser', {}, { freezeTableName: true }); var User = this.sequelize.define('FrozenUser', {}, { freezeTableName: true });
expect(User.tableName).to.equal('FrozenUser'); expect(User.tableName).to.equal('FrozenUser');
done();
}); });
it('uses the pluralized dao name as tablename unless freezeTableName', function(done) { it('uses the pluralized dao name as tablename unless freezeTableName', function() {
var User = this.sequelize.define('SuperUser', {}, { freezeTableName: false }); var User = this.sequelize.define('SuperUser', {}, { freezeTableName: false });
expect(User.tableName).to.equal('SuperUsers'); expect(User.tableName).to.equal('SuperUsers');
done();
}); });
it('uses checks to make sure dao factory isnt leaking on multiple define', function(done) { it('uses checks to make sure dao factory isnt leaking on multiple define', function() {
this.sequelize.define('SuperUser', {}, { freezeTableName: false }); this.sequelize.define('SuperUser', {}, { freezeTableName: false });
var factorySize = this.sequelize.daoFactoryManager.all.length; var factorySize = this.sequelize.daoFactoryManager.all.length;
...@@ -54,10 +50,9 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -54,10 +50,9 @@ describe(Support.getTestDialectTeaser('Model'), function() {
var factorySize2 = this.sequelize.daoFactoryManager.all.length; var factorySize2 = this.sequelize.daoFactoryManager.all.length;
expect(factorySize).to.equal(factorySize2); expect(factorySize).to.equal(factorySize2);
done();
}); });
it('attaches class and instance methods', function(done) { it('attaches class and instance methods', function() {
var User = this.sequelize.define('UserWithClassAndInstanceMethods', {}, { var User = this.sequelize.define('UserWithClassAndInstanceMethods', {}, {
classMethods: { doSmth: function() { return 1; } }, classMethods: { doSmth: function() { return 1; } },
instanceMethods: { makeItSo: function() { return 2; } } instanceMethods: { makeItSo: function() { return 2; } }
...@@ -70,10 +65,9 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -70,10 +65,9 @@ describe(Support.getTestDialectTeaser('Model'), function() {
expect(User.build().doSmth).not.to.exist; expect(User.build().doSmth).not.to.exist;
expect(User.build().makeItSo).to.exist; expect(User.build().makeItSo).to.exist;
expect(User.build().makeItSo()).to.equal(2); expect(User.build().makeItSo()).to.equal(2);
done();
}); });
it('allows us us to predefine the ID column with our own specs', function(done) { it('allows us us to predefine the ID column with our own specs', function() {
var User = this.sequelize.define('UserCol', { var User = this.sequelize.define('UserCol', {
id: { id: {
type: Sequelize.STRING, type: Sequelize.STRING,
...@@ -82,15 +76,12 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -82,15 +76,12 @@ describe(Support.getTestDialectTeaser('Model'), function() {
} }
}); });
User.sync({ force: true }).success(function() { return User.sync({ force: true }).then(function() {
User.create({id: 'My own ID!'}).success(function(user) { return expect(User.create({id: 'My own ID!'})).to.eventually.have.property('id', 'My own ID!');
expect(user.id).to.equal('My own ID!');
done();
});
}); });
}); });
it('throws an error if 2 autoIncrements are passed', function(done) { it('throws an error if 2 autoIncrements are passed', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.define('UserWithTwoAutoIncrements', { self.sequelize.define('UserWithTwoAutoIncrements', {
...@@ -98,10 +89,9 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -98,10 +89,9 @@ describe(Support.getTestDialectTeaser('Model'), function() {
userscore: { type: Sequelize.INTEGER, primaryKey: true, autoIncrement: true } userscore: { type: Sequelize.INTEGER, primaryKey: true, autoIncrement: true }
}); });
}).to.throw(Error, 'Invalid Instance definition. Only one autoincrement field allowed.'); }).to.throw(Error, 'Invalid Instance definition. Only one autoincrement field allowed.');
done();
}); });
it('throws an error if a custom model-wide validation is not a function', function(done) { it('throws an error if a custom model-wide validation is not a function', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.define('Foo', { self.sequelize.define('Foo', {
...@@ -112,10 +102,9 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -112,10 +102,9 @@ describe(Support.getTestDialectTeaser('Model'), function() {
} }
}); });
}).to.throw(Error, 'Members of the validate option must be functions. Model: Foo, error with validate member notFunction'); }).to.throw(Error, 'Members of the validate option must be functions. Model: Foo, error with validate member notFunction');
done();
}); });
it('throws an error if a custom model-wide validation has the same name as a field', function(done) { it('throws an error if a custom model-wide validation has the same name as a field', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.define('Foo', { self.sequelize.define('Foo', {
...@@ -126,7 +115,6 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -126,7 +115,6 @@ describe(Support.getTestDialectTeaser('Model'), function() {
} }
}); });
}).to.throw(Error, 'A model validator function must not have the same name as a field. Model: Foo, field/validation name: field'); }).to.throw(Error, 'A model validator function must not have the same name as a field. Model: Foo, field/validation name: field');
done();
}); });
it('should allow me to set a default value for createdAt and updatedAt', function(done) { it('should allow me to set a default value for createdAt and updatedAt', function(done) {
...@@ -1235,8 +1223,9 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -1235,8 +1223,9 @@ describe(Support.getTestDialectTeaser('Model'), function() {
}); });
}); });
it('sets deletedAt to the current timestamp if paranoid is true', function(done) { it('sets deletedAt to the current timestamp if paranoid is true', function() {
var self = this var self = this
, qi = this.sequelize.queryInterface.QueryGenerator.quoteIdentifier.bind(this.sequelize.queryInterface.QueryGenerator)
, ParanoidUser = self.sequelize.define('ParanoidUser', { , ParanoidUser = self.sequelize.define('ParanoidUser', {
username: Sequelize.STRING, username: Sequelize.STRING,
secretValue: Sequelize.STRING, secretValue: Sequelize.STRING,
...@@ -1249,26 +1238,25 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -1249,26 +1238,25 @@ describe(Support.getTestDialectTeaser('Model'), function() {
{ username: 'Paul', secretValue: '42' }, { username: 'Paul', secretValue: '42' },
{ username: 'Bob', secretValue: '43' }]; { username: 'Bob', secretValue: '43' }];
ParanoidUser.sync({ force: true }).success(function() { return ParanoidUser.sync({ force: true }).then(function() {
ParanoidUser.bulkCreate(data).success(function() { return ParanoidUser.bulkCreate(data);
// since we save in UTC, let's format to UTC time }).bind({}).then(function() {
var date = moment().utc().format('YYYY-MM-DD h:mm'); // since we save in UTC, let's format to UTC time
ParanoidUser.destroy({where: {secretValue: '42'}}).success(function() { this.date = moment().utc().format('YYYY-MM-DD h:mm');
ParanoidUser.findAll({order: 'id'}).success(function(users) { return ParanoidUser.destroy({where: {secretValue: '42'}});
expect(users.length).to.equal(1); }).then(function() {
expect(users[0].username).to.equal('Bob'); return ParanoidUser.findAll({order: 'id'});
}).then(function(users) {
expect(users.length).to.equal(1);
expect(users[0].username).to.equal('Bob');
self.sequelize.query('SELECT * FROM ' + self.sequelize.queryInterface.QueryGenerator.quoteIdentifier('ParanoidUsers') + ' WHERE ' + self.sequelize.queryInterface.QueryGenerator.quoteIdentifier('deletedAt') + ' IS NOT NULL ORDER BY ' + self.sequelize.queryInterface.QueryGenerator.quoteIdentifier('id'), null, {raw: true}).success(function(users) { return self.sequelize.query('SELECT * FROM ' + qi('ParanoidUsers') + ' WHERE ' + qi('deletedAt') + ' IS NOT NULL ORDER BY ' + qi('id'));
expect(users[0].username).to.equal('Peter'); }).spread(function(users) {
expect(users[1].username).to.equal('Paul'); expect(users[0].username).to.equal('Peter');
expect(users[1].username).to.equal('Paul');
expect(moment(new Date(users[0].deletedAt)).utc().format('YYYY-MM-DD h:mm')).to.equal(date); expect(moment(new Date(users[0].deletedAt)).utc().format('YYYY-MM-DD h:mm')).to.equal(this.date);
expect(moment(new Date(users[1].deletedAt)).utc().format('YYYY-MM-DD h:mm')).to.equal(date); expect(moment(new Date(users[1].deletedAt)).utc().format('YYYY-MM-DD h:mm')).to.equal(this.date);
done();
});
});
});
});
}); });
}); });
...@@ -1377,46 +1365,44 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -1377,46 +1365,44 @@ describe(Support.getTestDialectTeaser('Model'), function() {
}); });
}); });
it('should delete a paranoid record if I set force to true', function(done) { it('should delete a paranoid record if I set force to true', function() {
var self = this; var self = this;
var User = this.sequelize.define('paranoiduser', { var User = this.sequelize.define('paranoiduser', {
username: Sequelize.STRING username: Sequelize.STRING
}, { paranoid: true }); }, { paranoid: true });
User.sync({ force: true }).success(function() { return User.sync({ force: true }).then(function() {
User.bulkCreate([ return User.bulkCreate([
{username: 'Bob'}, {username: 'Bob'},
{username: 'Tobi'}, {username: 'Tobi'},
{username: 'Max'}, {username: 'Max'},
{username: 'Tony'} {username: 'Tony'}
]).success(function() { ]);
User.find({where: {username: 'Bob'}}).success(function(user) { }).then(function() {
user.destroy({force: true}).success(function() { return User.find({where: {username: 'Bob'}});
User.find({where: {username: 'Bob'}}).success(function(user) { }).then(function(user) {
expect(user).to.be.null; return user.destroy({force: true});
User.find({where: {username: 'Tobi'}}).success(function(tobi) { }).then(function() {
tobi.destroy().success(function() { return expect(User.find({where: {username: 'Bob'}})).to.eventually.be.null;
self.sequelize.query('SELECT * FROM paranoidusers WHERE username=\'Tobi\'', null, {raw: true, plain: true}).success(function(result) { }).then(function(user) {
expect(result.username).to.equal('Tobi'); return User.find({where: {username: 'Tobi'}});
User.destroy({where: {username: 'Tony'}}).success(function() { }).then(function(tobi) {
self.sequelize.query('SELECT * FROM paranoidusers WHERE username=\'Tony\'', null, {raw: true, plain: true}).success(function(result) { return tobi.destroy();
expect(result.username).to.equal('Tony'); }).then(function() {
User.destroy({where: {username: ['Tony', 'Max']}, force: true}).success(function() { return self.sequelize.query('SELECT * FROM paranoidusers WHERE username=\'Tobi\'', { plain: true});
self.sequelize.query('SELECT * FROM paranoidusers', null, {raw: true}).success(function(users) { }).then(function(result) {
expect(users).to.have.length(1); expect(result.username).to.equal('Tobi');
expect(users[0].username).to.equal('Tobi'); return User.destroy({where: {username: 'Tony'}});
done(); }).then(function() {
}); return self.sequelize.query('SELECT * FROM paranoidusers WHERE username=\'Tony\'', { plain: true});
}); }).then(function(result) {
}); expect(result.username).to.equal('Tony');
}); return User.destroy({where: {username: ['Tony', 'Max']}, force: true});
}); }).then(function() {
}); return self.sequelize.query('SELECT * FROM paranoidusers', null, {raw: true});
}); }).spread(function(users) {
}); expect(users).to.have.length(1);
}); expect(users[0].username).to.equal('Tobi');
});
});
}); });
}); });
......
test/integration/query-interface.test.js
...@@ -424,15 +424,15 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -424,15 +424,15 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
}); });
}); });
it('should get a list of foreign keys for the table', function(done) { it('should get a list of foreign keys for the table', function() {
var sql = var sql = this.queryInterface.QueryGenerator.getForeignKeysQuery('hosts', this.sequelize.config.database);
this.queryInterface.QueryGenerator.getForeignKeysQuery('hosts', this.sequelize.config.database);
this.sequelize.query(sql).complete(function(err, fks) { return this.sequelize.query(sql, {type: this.sequelize.QueryTypes.FOREIGNKEYS}).then(function(fks) {
expect(err).to.be.null;
expect(fks).to.have.length(3); expect(fks).to.have.length(3);
var keys = Object.keys(fks[0]), var keys = Object.keys(fks[0]),
keys2 = Object.keys(fks[1]), keys2 = Object.keys(fks[1]),
keys3 = Object.keys(fks[2]); keys3 = Object.keys(fks[2]);
if (dialect === 'postgres' || dialect === 'postgres-native') { if (dialect === 'postgres' || dialect === 'postgres-native') {
expect(keys).to.have.length(6); expect(keys).to.have.length(6);
expect(keys2).to.have.length(7); expect(keys2).to.have.length(7);
...@@ -444,10 +444,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -444,10 +444,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
} else { } else {
console.log("This test doesn't support " + dialect); console.log("This test doesn't support " + dialect);
} }
done();
}); });
}); });
}); });
}); });
test/integration/sequelize.test.js
...@@ -247,61 +247,46 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() { ...@@ -247,61 +247,46 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
}); });
}); });
it('executes select queries correctly', function(done) { it('executes select queries correctly', function() {
var self = this; var self = this;
self.sequelize.query(this.insertQuery).success(function() { return self.sequelize.query(this.insertQuery).then(function() {
self.sequelize return self.sequelize.query('select * from ' + qq(self.User.tableName) + '');
.query('select * from ' + qq(self.User.tableName) + '') }).spread(function(users) {
.complete(function(err, users) { expect(users.map(function(u) { return u.username; })).to.include('john');
expect(err).to.be.null;
expect(users.map(function(u) { return u.username; })).to.include('john');
done();
});
}); });
}); });
it('executes select queries correctly when quoteIdentifiers is false', function(done) { it('executes select queries correctly when quoteIdentifiers is false', function() {
var self = this var self = this
, seq = Object.create(self.sequelize); , seq = Object.create(self.sequelize);
seq.options.quoteIdentifiers = false; seq.options.quoteIdentifiers = false;
seq.query(this.insertQuery).success(function() { return seq.query(this.insertQuery).then(function() {
seq.query('select * from ' + qq(self.User.tableName) + '') return seq.query('select * from ' + qq(self.User.tableName) + '');
.complete(function(err, users) { }).spread(function(users) {
expect(err).to.be.null; expect(users.map(function(u) { return u.username; })).to.include('john');
expect(users.map(function(u) { return u.username; })).to.include('john');
done();
});
}); });
}); });
it('executes select query with dot notation results', function(done) { it('executes select query with dot notation results', function() {
var self = this; var self = this;
self.sequelize.query('DELETE FROM ' + qq(self.User.tableName)).complete(function() { return self.sequelize.query('DELETE FROM ' + qq(self.User.tableName)).then(function() {
self.sequelize.query(self.insertQuery).success(function() { return self.sequelize.query(self.insertQuery);
self.sequelize }).then(function() {
.query('select username as ' + qq('user.username') + ' from ' + qq(self.User.tableName) + '') return self.sequelize.query('select username as ' + qq('user.username') + ' from ' + qq(self.User.tableName) + '');
.complete(function(err, users) { }).spread(function( users) {
expect(err).to.be.null; expect(users).to.deep.equal([{'user.username': 'john'}]);
expect(users).to.deep.equal([{'user.username': 'john'}]);
done();
});
});
}); });
}); });
it('executes select query with dot notation results and nest it', function(done) { it('executes select query with dot notation results and nest it', function() {
var self = this; var self = this;
self.sequelize.query('DELETE FROM ' + qq(self.User.tableName)).complete(function() { return self.sequelize.query('DELETE FROM ' + qq(self.User.tableName)).then(function() {
self.sequelize.query(self.insertQuery).success(function() { return self.sequelize.query(self.insertQuery);
self.sequelize }).then(function() {
.query('select username as ' + qq('user.username') + ' from ' + qq(self.User.tableName) + '', null, { raw: true, nest: true }) return self.sequelize.query('select username as ' + qq('user.username') + ' from ' + qq(self.User.tableName) + '', null, { raw: true, nest: true });
.complete(function(err, users) { }).then(function(users) {
expect(err).to.be.null; expect(users.map(function(u) { return u.user; })).to.deep.equal([{'username': 'john'}]);
expect(users.map(function(u) { return u.user; })).to.deep.equal([{'username': 'john'}]);
done();
});
});
}); });
}); });
...@@ -325,24 +310,19 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() { ...@@ -325,24 +310,19 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
console.log('FIXME: I want to be supported in this dialect as well :-('); console.log('FIXME: I want to be supported in this dialect as well :-(');
} }
it('uses the passed DAOFactory', function(done) { it('uses the passed model', function() {
var self = this; return this.sequelize.query(this.insertQuery).bind(this).then(function() {
self.sequelize.query(this.insertQuery).success(function() { return this.sequelize.query('SELECT * FROM ' + qq(this.User.tableName) + ';', this.User, { type: this.sequelize.QueryTypes.SELECT });
self.sequelize.query('SELECT * FROM ' + qq(self.User.tableName) + ';', self.User).success(function(users) { }).then(function(users) {
expect(users[0].Model).to.equal(self.User); expect(users[0].Model).to.equal(this.User);
done();
});
}); });
}); });
it('dot separated attributes when doing a raw query without nest', function(done) { it('dot separated attributes when doing a raw query without nest', function() {
var tickChar = (dialect === 'postgres' || dialect === 'mssql') ? '"' : '`' var tickChar = (dialect === 'postgres' || dialect === 'mssql') ? '"' : '`'
, sql = 'select 1 as ' + Sequelize.Utils.addTicks('foo.bar.baz', tickChar); , sql = 'select 1 as ' + Sequelize.Utils.addTicks('foo.bar.baz', tickChar);
this.sequelize.query(sql, null, { raw: true, nest: false }).success(function(result) { return expect(this.sequelize.query(sql, null, { raw: true, nest: false }).get(0)).to.eventually.deep.equal([{ 'foo.bar.baz': 1 }]);
expect(result).to.deep.equal([{ 'foo.bar.baz': 1 }]);
done();
});
}); });
it('destructs dot separated attributes when doing a raw query using nest', function(done) { it('destructs dot separated attributes when doing a raw query using nest', function(done) {
...@@ -356,108 +336,87 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() { ...@@ -356,108 +336,87 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
}); });
it('replaces token with the passed array', function(done) { it('replaces token with the passed array', function(done) {
this.sequelize.query('select ? as foo, ? as bar', null, { raw: true }, [1, 2]).success(function(result) { this.sequelize.query('select ? as foo, ? as bar', null, { type: this.sequelize.QueryTypes.SELECT, replacements: [1, 2] }).success(function(result) {
expect(result).to.deep.equal([{ foo: 1, bar: 2 }]); expect(result).to.deep.equal([{ foo: 1, bar: 2 }]);
done(); done();
}); });
}); });
it('replaces named parameters with the passed object', function(done) { it('replaces named parameters with the passed object', function() {
this.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, { one: 1, two: 2 }).success(function(result) { return expect(this.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: { one: 1, two: 2 }}).get(0))
expect(result).to.deep.equal([{ foo: 1, bar: 2 }]); .to.eventually.deep.equal([{ foo: 1, bar: 2 }]);
done();
});
}); });
it('replaces named parameters with the passed object and ignore those which does not qualify', function(done) { it('replaces named parameters with the passed object and ignore those which does not qualify', function() {
this.sequelize.query('select :one as foo, :two as bar, \'00:00\' as baz', null, { raw: true }, { one: 1, two: 2 }).success(function(result) { return expect(this.sequelize.query('select :one as foo, :two as bar, \'00:00\' as baz', null, { raw: true, replacements: { one: 1, two: 2 }}).get(0))
expect(result).to.deep.equal([{ foo: 1, bar: 2, baz: '00:00' }]); .to.eventually.deep.equal([{ foo: 1, bar: 2, baz: '00:00' }]);
done();
});
}); });
it('replaces named parameters with the passed object using the same key twice', function(done) { it('replaces named parameters with the passed object using the same key twice', function() {
this.sequelize.query('select :one as foo, :two as bar, :one as baz', null, { raw: true }, { one: 1, two: 2 }).success(function(result) { return expect(this.sequelize.query('select :one as foo, :two as bar, :one as baz', null, { raw: true, replacements: { one: 1, two: 2 }}).get(0))
expect(result).to.deep.equal([{ foo: 1, bar: 2, baz: 1 }]); .to.eventually.deep.equal([{ foo: 1, bar: 2, baz: 1 }]);
done();
});
}); });
it('replaces named parameters with the passed object having a null property', function(done) { it('replaces named parameters with the passed object having a null property', function() {
this.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, { one: 1, two: null }).success(function(result) { return expect(this.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: { one: 1, two: null }}).get(0))
expect(result).to.deep.equal([{ foo: 1, bar: null }]); .to.eventually.deep.equal([{ foo: 1, bar: null }]);
done();
});
}); });
it('throw an exception when key is missing in the passed object', function(done) { it('throw an exception when key is missing in the passed object', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.query('select :one as foo, :two as bar, :three as baz', null, { raw: true }, { one: 1, two: 2 }); self.sequelize.query('select :one as foo, :two as bar, :three as baz', null, { raw: true, replacements: { one: 1, two: 2 }});
}).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g); }).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g);
done();
}); });
it('throw an exception with the passed number', function(done) { it('throw an exception with the passed number', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, 2); self.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: 2 });
}).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g); }).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g);
done();
}); });
it('throw an exception with the passed empty object', function(done) { it('throw an exception with the passed empty object', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, {}); self.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: {}});
}).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g); }).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g);
done();
}); });
it('throw an exception with the passed string', function(done) { it('throw an exception with the passed string', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, 'foobar'); self.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: 'foobar'});
}).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g); }).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g);
done();
}); });
it('throw an exception with the passed date', function(done) { it('throw an exception with the passed date', function() {
var self = this; var self = this;
expect(function() { expect(function() {
self.sequelize.query('select :one as foo, :two as bar', null, { raw: true }, new Date()); self.sequelize.query('select :one as foo, :two as bar', null, { raw: true, replacements: new Date()});
}).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g); }).to.throw(Error, /Named parameter ":\w+" has no value in the given object\./g);
done();
}); });
it('handles AS in conjunction with functions just fine', function(done) { it('handles AS in conjunction with functions just fine', function() {
var datetime = (dialect === 'sqlite' ? 'date(\'now\')' : 'NOW()'); var datetime = (dialect === 'sqlite' ? 'date(\'now\')' : 'NOW()');
if (dialect === 'mssql') { if (dialect === 'mssql') {
datetime = 'GETDATE()'; datetime = 'GETDATE()';
} }
this.sequelize.query('SELECT ' + datetime + ' AS t').success(function(result) { return this.sequelize.query('SELECT ' + datetime + ' AS t').spread(function(result) {
expect(moment(result[0].t).isValid()).to.be.true; expect(moment(result[0].t).isValid()).to.be.true;
done();
}); });
}); });
if (Support.getTestDialect() === 'postgres') { if (Support.getTestDialect() === 'postgres') {
it('replaces named parameters with the passed object and ignores casts', function(done) { it('replaces named parameters with the passed object and ignores casts', function() {
this.sequelize.query('select :one as foo, :two as bar, \'1000\'::integer as baz', null, { raw: true }, { one: 1, two: 2 }).success(function(result) { return expect(this.sequelize.query('select :one as foo, :two as bar, \'1000\'::integer as baz', null, { raw: true }, { one: 1, two: 2 }).get(0))
expect(result).to.deep.equal([{ foo: 1, bar: 2, baz: 1000 }]); .to.eventually.deep.equal([{ foo: 1, bar: 2, baz: 1000 }]);
done();
});
}); });
it('supports WITH queries', function(done) { it('supports WITH queries', function() {
this return expect(this.sequelize.query('WITH RECURSIVE t(n) AS ( VALUES (1) UNION ALL SELECT n+1 FROM t WHERE n < 100) SELECT sum(n) FROM t').get(0))
.sequelize .to.eventually.deep.equal([{ 'sum': '5050' }]);
.query('WITH RECURSIVE t(n) AS ( VALUES (1) UNION ALL SELECT n+1 FROM t WHERE n < 100) SELECT sum(n) FROM t')
.success(function(results) {
expect(results).to.deep.equal([{ 'sum': '5050' }]);
done();
});
}); });
} }
}); });
...@@ -475,7 +434,7 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() { ...@@ -475,7 +434,7 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
this.t = t; this.t = t;
return this.sequelize.set({ foo: 'bar' }, { transaction: t }); return this.sequelize.set({ foo: 'bar' }, { transaction: t });
}).then(function() { }).then(function() {
return this.sequelize.query('SELECT @foo as `foo`', null, { raw: true, plain: true, transaction: this.t }); return this.sequelize.query('SELECT @foo as `foo`', { plain: true, transaction: this.t });
}).then(function(data) { }).then(function(data) {
expect(data).to.be.ok; expect(data).to.be.ok;
expect(data.foo).to.be.equal('bar'); expect(data.foo).to.be.equal('bar');
...@@ -491,7 +450,7 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() { ...@@ -491,7 +450,7 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
foos: 'bars' foos: 'bars'
}, { transaction: t }); }, { transaction: t });
}).then(function() { }).then(function() {
return this.sequelize.query('SELECT @foo as `foo`, @foos as `foos`', null, { raw: true, plain: true, transaction: this.t }); return this.sequelize.query('SELECT @foo as `foo`, @foos as `foos`', { plain: true, transaction: this.t });
}).then(function(data) { }).then(function(data) {
expect(data).to.be.ok; expect(data).to.be.ok;
expect(data.foo).to.be.equal('bar'); expect(data.foo).to.be.equal('bar');
...@@ -915,87 +874,71 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() { ...@@ -915,87 +874,71 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
}); });
if (dialect === 'sqlite') { if (dialect === 'sqlite') {
it('correctly scopes transaction from other connections', function(done) { it('correctly scopes transaction from other connections', function() {
var TransactionTest = this.sequelizeWithTransaction.define('TransactionTest', { name: DataTypes.STRING }, { timestamps: false }) var TransactionTest = this.sequelizeWithTransaction.define('TransactionTest', { name: DataTypes.STRING }, { timestamps: false })
, self = this; , self = this;
var count = function(transaction, callback) { var count = function(transaction) {
var sql = self.sequelizeWithTransaction.getQueryInterface().QueryGenerator.selectQuery('TransactionTests', { attributes: [['count(*)', 'cnt']] }); var sql = self.sequelizeWithTransaction.getQueryInterface().QueryGenerator.selectQuery('TransactionTests', { attributes: [['count(*)', 'cnt']] });
self return self.sequelizeWithTransaction.query(sql, { plain: true, transaction: transaction }).then(function(result) {
.sequelizeWithTransaction return result.cnt;
.query(sql, null, { plain: true, raw: true, transaction: transaction }) });
.success(function(result) { callback(result.cnt); });
}; };
TransactionTest.sync({ force: true }).success(function() { return TransactionTest.sync({ force: true }).bind(this).then(function() {
self.sequelizeWithTransaction.transaction().then(function(t1) { return self.sequelizeWithTransaction.transaction();
self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', null, { plain: true, raw: true, transaction: t1 }).success(function() { }).then(function(t1) {
count(null, function(cnt) { this.t1 = t1;
expect(cnt).to.equal(0); return self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', { transaction: t1 });
}).then(function() {
count(t1, function(cnt) { return expect(count()).to.eventually.equal(0);
expect(cnt).to.equal(1); }).then(function(cnt) {
return expect(count(this.t1)).to.eventually.equal(1);
t1.commit().success(function() { }).then(function () {
count(null, function(cnt) { return this.t1.commit();
expect(cnt).to.equal(1); }).then(function() {
done(); return expect(count()).to.eventually.equal(1);
});
});
});
});
});
});
}); });
}); });
} else { } else {
it('correctly handles multiple transactions', function(done) { it('correctly handles multiple transactions', function() {
var TransactionTest = this.sequelizeWithTransaction.define('TransactionTest', { name: DataTypes.STRING }, { timestamps: false }) var TransactionTest = this.sequelizeWithTransaction.define('TransactionTest', { name: DataTypes.STRING }, { timestamps: false })
, self = this; , self = this;
var count = function(transaction, callback) { var count = function(transaction) {
var sql = self.sequelizeWithTransaction.getQueryInterface().QueryGenerator.selectQuery('TransactionTests', { attributes: [['count(*)', 'cnt']] }); var sql = self.sequelizeWithTransaction.getQueryInterface().QueryGenerator.selectQuery('TransactionTests', { attributes: [['count(*)', 'cnt']] });
self return self.sequelizeWithTransaction.query(sql, { plain: true, transaction: transaction }).then(function(result) {
.sequelizeWithTransaction return parseInt(result.cnt, 10);
.query(sql, null, { plain: true, raw: true, transaction: transaction }) });
.success(function(result) { callback(parseInt(result.cnt, 10)); });
}; };
TransactionTest.sync({ force: true }).success(function() { return TransactionTest.sync({ force: true }).bind(this).then(function() {
self.sequelizeWithTransaction.transaction().then(function(t1) { return self.sequelizeWithTransaction.transaction();
self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', null, { plain: true, raw: true, transaction: t1 }).success(function() { }).then(function(t1) {
self.sequelizeWithTransaction.transaction().then(function(t2) { this.t1 = t1;
self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'bar\');', null, { plain: true, raw: true, transaction: t2 }).success(function() { return self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'foo\');', null, { transaction: t1 });
count(null, function(cnt) { }).then(function() {
expect(cnt).to.equal(0); return self.sequelizeWithTransaction.transaction();
}).then(function(t2) {
count(t1, function(cnt) { this.t2 = t2;
expect(cnt).to.equal(1); return self.sequelizeWithTransaction.query('INSERT INTO ' + qq('TransactionTests') + ' (' + qq('name') + ') VALUES (\'bar\');', null, { transaction: t2 });
}).then(function() {
count(t2, function(cnt) { return expect(count()).to.eventually.equal(0);
expect(cnt).to.equal(1); }).then(function() {
return expect(count(this.t1)).to.eventually.equal(1);
t2.rollback().success(function() { }).then(function() {
count(null, function(cnt) { return expect(count(this.t2)).to.eventually.equal(1);
expect(cnt).to.equal(0); }).then(function() {
t1.commit().success(function() { return this.t2.rollback();
count(null, function(cnt) { }).then(function() {
expect(cnt).to.equal(1); return expect(count()).to.eventually.equal(0);
done(); }).then(function(cnt) {
}); return this.t1.commit();
}); }).then(function() {
}); return expect(count()).to.eventually.equal(1);
});
});
});
});
});
});
});
});
}); });
}); });
} }
......
test/integration/sequelize.transaction.test.js
...@@ -20,7 +20,7 @@ describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() { ...@@ -20,7 +20,7 @@ describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() {
.success(function() { done(); }); .success(function() { done(); });
}); });
it('gets triggered once a transaction has been successfully rollbacked', function(done) { it('gets triggered once a transaction has been successfully rolled back', function(done) {
this this
.sequelize .sequelize
.transaction().then(function(t) { t.rollback(); }) .transaction().then(function(t) { t.rollback(); })
...@@ -28,59 +28,44 @@ describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() { ...@@ -28,59 +28,44 @@ describe(Support.getTestDialectTeaser('Sequelize#transaction'), function() {
}); });
if (Support.getTestDialect() !== 'sqlite') { if (Support.getTestDialect() !== 'sqlite') {
it('works for long running transactions', function(done) { it('works for long running transactions', function() {
Support.prepareTransactionTest(this.sequelize, function(sequelize) { this.timeout(10000);
var User = sequelize.define('User', { return Support.prepareTransactionTest(this.sequelize).bind(this).then(function(sequelize) {
this.sequelize = sequelize;
this.User = sequelize.define('User', {
name: Support.Sequelize.STRING name: Support.Sequelize.STRING
}, { timestamps: false }); }, { timestamps: false });
return sequelize.sync({ force: true }).success(function() { return sequelize.sync({ force: true });
return sequelize.transaction(); }).then(function() {
}).then(function(t) { return this.sequelize.transaction();
expect(t).to.be.ok; }).then(function(t) {
var query = 'select sleep(2);'; var query = 'select sleep(2);';
switch (Support.getTestDialect()) { switch (Support.getTestDialect()) {
case 'postgres': case 'postgres':
query = 'select pg_sleep(2);'; query = 'select pg_sleep(2);';
break; break;
case 'sqlite': case 'sqlite':
query = 'select sqlite3_sleep(2000);'; query = 'select sqlite3_sleep(2000);';
break; break;
default: default:
break; break;
} }
return sequelize.query(query, null, { return this.sequelize.query(query, { transaction: t }).bind(this).then(function() {
raw: true, return this.User.create({ name: 'foo' });
plain: true,
transaction: t
}).then(function() {
var dao = User.build({ name: 'foo' });
// this.QueryGenerator.insertQuery(tableName, values, dao.daoFactory.rawAttributes)
return query = sequelize
.getQueryInterface()
.QueryGenerator
.insertQuery(User.tableName, dao.values, User.rawAttributes);
}).then(function() {
return Promise.delay(1000);
}).then(function() {
return sequelize.query(query, null, {
raw: true,
plain: true,
transaction: t
});
}).then(function() {
return t.commit();
});
}).then(function() { }).then(function() {
return User.all().success(function(users) { return this.sequelize.query(query, { transaction: t });
expect(users.length).to.equal(1); }).then(function() {
expect(users[0].name).to.equal('foo'); return t.commit();
done(); });
}); }).then(function() {
}).catch (done); return this.User.all();
}).then(function(users) {
expect(users.length).to.equal(1);
expect(users[0].name).to.equal('foo');
}); });
}); });
} }
......
test/integration/timezone.test.js
...@@ -28,8 +28,8 @@ if (dialect !== 'sqlite') { ...@@ -28,8 +28,8 @@ if (dialect !== 'sqlite') {
var query = 'SELECT ' + now + ' as now'; var query = 'SELECT ' + now + ' as now';
return Promise.all([ return Promise.all([
this.sequelize.query(query), this.sequelize.query(query, { type: this.sequelize.QueryTypes.SELECT }),
this.sequelizeWithTimezone.query(query) this.sequelizeWithTimezone.query(query, { type: this.sequelize.QueryTypes.SELECT })
]).spread(function(now1, now2) { ]).spread(function(now1, now2) {
var elapsedQueryTime = (Date.now() - startQueryTime) + 20; var elapsedQueryTime = (Date.now() - startQueryTime) + 20;
expect(now1[0].now.getTime()).to.be.closeTo(now2[0].now.getTime(), elapsedQueryTime); expect(now1[0].now.getTime()).to.be.closeTo(now2[0].now.getTime(), elapsedQueryTime);
......
test/integration/transaction.test.js
...@@ -98,7 +98,7 @@ describe(Support.getTestDialectTeaser('Transaction'), function() { ...@@ -98,7 +98,7 @@ describe(Support.getTestDialectTeaser('Transaction'), function() {
.then(function(t) { .then(function(t) {
return sequelize.sync({transaction:t}) return sequelize.sync({transaction:t})
.then(function( ) { .then(function( ) {
return t; return t;
}); });
}) })
.then(function(t) { .then(function(t) {
...@@ -116,7 +116,7 @@ describe(Support.getTestDialectTeaser('Transaction'), function() { ...@@ -116,7 +116,7 @@ describe(Support.getTestDialectTeaser('Transaction'), function() {
.then(function(users) { .then(function(users) {
return expect(users.length).to.equal(1); return expect(users.length).to.equal(1);
}); });
}); });
} }
if (current.dialect.supports.lock) { if (current.dialect.supports.lock) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!