Skip to content

public / sequelize

Go to a project

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

Commit e68096f3 by Felix Becker Committed by Jan Aagaard Meier
Options

Fix all auto-fixable ESLint issues (#6436)

1 parent fb2d28c2
Inline Side-by-side
Showing with 162 additions and 162 deletions
lib/associations/base.js
......@@ -3,7 +3,7 @@
var Association = function() {};
// Normalize input - may be array or single obj, instance or primary key - convert it to an array of built objects
Association.prototype.toInstanceArray = function (objs) {
Association.prototype.toInstanceArray = function(objs) {
if (!Array.isArray(objs)) {
objs = [objs];
}
......
lib/associations/helpers.js
......@@ -2,7 +2,7 @@
const Utils = require('./../utils');
function checkNamingCollision (association) {
function checkNamingCollision(association) {
if (association.source.rawAttributes.hasOwnProperty(association.as)) {
throw new Error(
'Naming collision between attribute \'' + association.as +
......@@ -13,7 +13,7 @@ function checkNamingCollision (association) {
}
exports.checkNamingCollision = checkNamingCollision;
function addForeignKeyConstraints (newAttribute, source, target, options, key) {
function addForeignKeyConstraints(newAttribute, source, target, options, key) {
// FK constraints are opt-in: users must either set `foreignKeyConstraints`
// on the association, or request an `onDelete` or `onUpdate` behaviour
......
lib/deferrable.js
......@@ -37,16 +37,16 @@ var util = require('util');
* @return {object}
*/
var Deferrable = module.exports = {
INITIALLY_DEFERRED: INITIALLY_DEFERRED,
INITIALLY_IMMEDIATE: INITIALLY_IMMEDIATE,
NOT: NOT,
SET_DEFERRED: SET_DEFERRED,
SET_IMMEDIATE: SET_IMMEDIATE
INITIALLY_DEFERRED,
INITIALLY_IMMEDIATE,
NOT,
SET_DEFERRED,
SET_IMMEDIATE
};
function ABSTRACT () {}
function ABSTRACT() {}
ABSTRACT.prototype.toString = function () {
ABSTRACT.prototype.toString = function() {
return this.toSql.apply(this, arguments);
};
......@@ -56,14 +56,14 @@ ABSTRACT.prototype.toString = function () {
*
* @property INITIALLY_DEFERRED
*/
function INITIALLY_DEFERRED () {
function INITIALLY_DEFERRED() {
if (!(this instanceof INITIALLY_DEFERRED)) {
return new INITIALLY_DEFERRED();
}
}
util.inherits(INITIALLY_DEFERRED, ABSTRACT);
INITIALLY_DEFERRED.prototype.toSql = function () {
INITIALLY_DEFERRED.prototype.toSql = function() {
return 'DEFERRABLE INITIALLY DEFERRED';
};
......@@ -73,14 +73,14 @@ INITIALLY_DEFERRED.prototype.toSql = function () {
*
* @property INITIALLY_IMMEDIATE
*/
function INITIALLY_IMMEDIATE () {
function INITIALLY_IMMEDIATE() {
if (!(this instanceof INITIALLY_IMMEDIATE)) {
return new INITIALLY_IMMEDIATE();
}
}
util.inherits(INITIALLY_IMMEDIATE, ABSTRACT);
INITIALLY_IMMEDIATE.prototype.toSql = function () {
INITIALLY_IMMEDIATE.prototype.toSql = function() {
return 'DEFERRABLE INITIALLY IMMEDIATE';
};
......@@ -92,14 +92,14 @@ INITIALLY_IMMEDIATE.prototype.toSql = function () {
*
* @property NOT
*/
function NOT () {
function NOT() {
if (!(this instanceof NOT)) {
return new NOT();
}
}
util.inherits(NOT, ABSTRACT);
NOT.prototype.toSql = function () {
NOT.prototype.toSql = function() {
return 'NOT DEFERRABLE';
};
......@@ -111,7 +111,7 @@ NOT.prototype.toSql = function () {
* @param {Array} constraints An array of constraint names. Will defer all constraints by default.
* @property SET_DEFERRED
*/
function SET_DEFERRED (constraints) {
function SET_DEFERRED(constraints) {
if (!(this instanceof SET_DEFERRED)) {
return new SET_DEFERRED(constraints);
}
......@@ -120,7 +120,7 @@ function SET_DEFERRED (constraints) {
}
util.inherits(SET_DEFERRED, ABSTRACT);
SET_DEFERRED.prototype.toSql = function (queryGenerator) {
SET_DEFERRED.prototype.toSql = function(queryGenerator) {
return queryGenerator.setDeferredQuery(this.constraints);
};
......@@ -132,7 +132,7 @@ SET_DEFERRED.prototype.toSql = function (queryGenerator) {
* @param {Array} constraints An array of constraint names. Will defer all constraints by default.
* @property SET_IMMEDIATE
*/
function SET_IMMEDIATE (constraints) {
function SET_IMMEDIATE(constraints) {
if (!(this instanceof SET_IMMEDIATE)) {
return new SET_IMMEDIATE(constraints);
}
......@@ -141,14 +141,14 @@ function SET_IMMEDIATE (constraints) {
}
util.inherits(SET_IMMEDIATE, ABSTRACT);
SET_IMMEDIATE.prototype.toSql = function (queryGenerator) {
SET_IMMEDIATE.prototype.toSql = function(queryGenerator) {
return queryGenerator.setImmediateQuery(this.constraints);
};
Object.keys(Deferrable).forEach(function (key) {
Object.keys(Deferrable).forEach(function(key) {
var DeferrableType = Deferrable[key];
DeferrableType.toString = function () {
DeferrableType.toString = function() {
var instance = new DeferrableType();
return instance.toString.apply(instance, arguments);
};
......
lib/dialects/abstract/connection-manager.js
......@@ -53,7 +53,7 @@ class ConnectionManager {
onProcessExit() {
if (this.pool) {
this.pool.drain(() => {
debug(`connection drain due to process exit`);
debug('connection drain due to process exit');
this.pool.destroyAllNow();
});
}
......@@ -83,7 +83,7 @@ class ConnectionManager {
});
},
destroy: (connection) => {
debug(`connection destroy`);
debug('connection destroy');
this._disconnect(connection);
return null;
},
......@@ -127,11 +127,11 @@ class ConnectionManager {
}
},
destroy: (connection) => {
debug(`connection destroy`);
debug('connection destroy');
return this.pool[connection.queryType].destroy(connection);
},
destroyAllNow: () => {
debug(`all connection destroy`);
debug('all connection destroy');
this.pool.read.destroyAllNow();
this.pool.write.destroyAllNow();
},
......@@ -215,7 +215,7 @@ class ConnectionManager {
return promise.then(() => new Promise((resolve, reject) => {
this.pool.acquire((err, connection) => {
if (err) return reject(err);
debug(`connection acquired`);
debug('connection acquired');
resolve(connection);
}, options.priority, options.type, options.useMaster);
}));
......@@ -224,7 +224,7 @@ class ConnectionManager {
releaseConnection(connection) {
return new Promise((resolve, reject) => {
this.pool.release(connection);
debug(`connection released`);
debug('connection released');
resolve();
});
}
......
lib/dialects/abstract/index.js
......@@ -50,7 +50,7 @@ AbstractDialect.prototype.supports = {
parser: false,
concurrently: false,
type: false,
using: true,
using: true
},
joinTableDependent: true,
groupedLimit: true,
......
lib/dialects/abstract/query-generator.js
......@@ -199,7 +199,7 @@ const QueryGenerator = {
}
if (this._dialect.supports.returnValues && options.returning) {
if (!!this._dialect.supports.returnValues.returning) {
if (this._dialect.supports.returnValues.returning) {
valueQuery += ' RETURNING *';
emptyQuery += ' RETURNING *';
} else if (!!this._dialect.supports.returnValues.output) {
......@@ -270,7 +270,7 @@ const QueryGenerator = {
// SERIALS' can't be NULL in postgresql, use DEFAULT where supported
if (modelAttributeMap && modelAttributeMap[key] && modelAttributeMap[key].autoIncrement === true && !value) {
if (!this._dialect.supports.autoIncrement.defaultValue) {
fields.splice(-1,1);
fields.splice(-1, 1);
} else if (this._dialect.supports.DEFAULT) {
values.push('DEFAULT');
} else {
......@@ -300,7 +300,7 @@ const QueryGenerator = {
query = [
'SET IDENTITY_INSERT', this.quoteTable(table), 'ON;',
query,
'SET IDENTITY_INSERT', this.quoteTable(table), 'OFF;',
'SET IDENTITY_INSERT', this.quoteTable(table), 'OFF;'
].join(' ');
}
......
lib/dialects/mssql/connection-manager.js
......@@ -72,7 +72,7 @@ class ConnectionManager extends AbstractConnectionManager {
connection.on('connect', err => {
if (!err) {
debug(`connection acquired`);
debug('connection acquired');
resolve(connectionLock);
return;
}
......@@ -137,7 +137,7 @@ class ConnectionManager extends AbstractConnectionManager {
return new Promise(resolve => {
connection.on('end', resolve);
connection.close();
debug(`connection closed`);
debug('connection closed');
});
}
......
lib/dialects/mssql/index.js
......@@ -14,7 +14,7 @@ var MssqlDialect = function(sequelize) {
this.QueryGenerator = _.extend({}, QueryGenerator, {
options: sequelize.options,
_dialect: this,
sequelize: sequelize
sequelize
});
};
......@@ -44,7 +44,7 @@ MssqlDialect.prototype.supports = _.merge(_.cloneDeep(Abstract.prototype.support
length: false,
parser: false,
type: true,
using: false,
using: false
},
NUMERIC: true,
tmpTableTrigger: true
......
lib/dialects/mssql/query-generator.js
......@@ -17,7 +17,7 @@ var QueryGenerator = {
options: {},
dialect: 'mssql',
createSchema: function(schema) {
createSchema(schema) {
return [
'IF NOT EXISTS (SELECT schema_name',
'FROM information_schema.schemata',
......@@ -30,7 +30,7 @@ var QueryGenerator = {
].join(' ');
},
showSchemasQuery: function() {
showSchemasQuery() {
return [
'SELECT "name" as "schema_name" FROM sys.schemas as s',
'WHERE "s"."name" NOT IN (',
......@@ -39,7 +39,7 @@ var QueryGenerator = {
].join(' ');
},
versionQuery: function() {
versionQuery() {
// Uses string manipulation to convert the MS Maj.Min.Patch.Build to semver Maj.Min.Patch
return [
'DECLARE @ms_ver NVARCHAR(20);',
......@@ -48,7 +48,7 @@ var QueryGenerator = {
].join(' ');
},
createTableQuery: function(tableName, attributes, options) {
createTableQuery(tableName, attributes, options) {
var query = "IF OBJECT_ID('<%= table %>', 'U') IS NULL CREATE TABLE <%= table %> (<%= attributes %>)"
, primaryKeys = []
, foreignKeys = {}
......@@ -84,7 +84,7 @@ var QueryGenerator = {
var values = {
table: this.quoteTable(tableName),
attributes: attrStr.join(', '),
attributes: attrStr.join(', ')
}
, pkString = primaryKeys.map(function(pk) { return this.quoteIdentifier(pk); }.bind(this)).join(', ');
......@@ -110,7 +110,7 @@ var QueryGenerator = {
return Utils._.template(query)(values).trim() + ';';
},
describeTableQuery: function(tableName, schema) {
describeTableQuery(tableName, schema) {
var sql = [
'SELECT',
"c.COLUMN_NAME AS 'Name',",
......@@ -137,7 +137,7 @@ var QueryGenerator = {
return sql;
},
renameTableQuery: function(before, after) {
renameTableQuery(before, after) {
var query = 'EXEC sp_rename <%= before %>, <%= after %>;';
return Utils._.template(query)({
before: this.quoteTable(before),
......@@ -145,11 +145,11 @@ var QueryGenerator = {
});
},
showTablesQuery: function () {
showTablesQuery() {
return 'SELECT TABLE_NAME, TABLE_SCHEMA FROM INFORMATION_SCHEMA.TABLES;';
},
dropTableQuery: function(tableName) {
dropTableQuery(tableName) {
var query = "IF OBJECT_ID('<%= table %>', 'U') IS NOT NULL DROP TABLE <%= table %>";
var values = {
table: this.quoteTable(tableName)
......@@ -158,7 +158,7 @@ var QueryGenerator = {
return Utils._.template(query)(values).trim() + ';';
},
addColumnQuery: function(table, key, dataType) {
addColumnQuery(table, key, dataType) {
// FIXME: attributeToSQL SHOULD be using attributes in addColumnQuery
// but instead we need to pass the key along as the field here
dataType.field = key;
......@@ -173,11 +173,11 @@ var QueryGenerator = {
return Utils._.template(query)({
table: this.quoteTable(table),
attribute: attribute
attribute
});
},
removeColumnQuery: function(tableName, attributeName) {
removeColumnQuery(tableName, attributeName) {
var query = 'ALTER TABLE <%= tableName %> DROP COLUMN <%= attributeName %>;';
return Utils._.template(query)({
tableName: this.quoteTable(tableName),
......@@ -185,7 +185,7 @@ var QueryGenerator = {
});
},
changeColumnQuery: function(tableName, attributes) {
changeColumnQuery(tableName, attributes) {
var query = 'ALTER TABLE <%= tableName %> <%= query %>;';
var attrString = [], constraintString = [];
......@@ -195,12 +195,12 @@ var QueryGenerator = {
constraintString.push(Utils._.template('<%= fkName %> FOREIGN KEY (<%= attrName %>) <%= definition %>')({
fkName: this.quoteIdentifier(attributeName + '_foreign_idx'),
attrName: this.quoteIdentifier(attributeName),
definition: definition.replace(/.+?(?=REFERENCES)/,'')
definition: definition.replace(/.+?(?=REFERENCES)/, '')
}));
} else {
attrString.push(Utils._.template('<%= attrName %> <%= definition %>')({
attrName: this.quoteIdentifier(attributeName),
definition: definition
definition
}));
}
}
......@@ -220,7 +220,7 @@ var QueryGenerator = {
});
},
renameColumnQuery: function(tableName, attrBefore, attributes) {
renameColumnQuery(tableName, attrBefore, attributes) {
var query = "EXEC sp_rename '<%= tableName %>.<%= before %>', '<%= after %>', 'COLUMN';"
, newName = Object.keys(attributes)[0];
......@@ -231,7 +231,7 @@ var QueryGenerator = {
});
},
bulkInsertQuery: function(tableName, attrValueHashes, options, attributes) {
bulkInsertQuery(tableName, attrValueHashes, options, attributes) {
var query = 'INSERT INTO <%= table %> (<%= attributes %>)<%= output %> VALUES <%= tuples %>;'
, emptyQuery = 'INSERT INTO <%= table %><%= output %> DEFAULT VALUES'
, tuples = []
......@@ -284,7 +284,7 @@ var QueryGenerator = {
attributes: allAttributes.map(function(attr) {
return this.quoteIdentifier(attr);
}.bind(this)).join(','),
tuples: tuples,
tuples,
output: outputFragment
};
......@@ -293,14 +293,14 @@ var QueryGenerator = {
generatedQuery = [
'SET IDENTITY_INSERT', this.quoteTable(tableName), 'ON;',
generatedQuery,
'SET IDENTITY_INSERT', this.quoteTable(tableName), 'OFF;',
'SET IDENTITY_INSERT', this.quoteTable(tableName), 'OFF;'
].join(' ');
}
return generatedQuery;
},
deleteQuery: function(tableName, where, options) {
deleteQuery(tableName, where, options) {
options = options || {};
var table = this.quoteTable(tableName);
......@@ -323,9 +323,9 @@ var QueryGenerator = {
}
var replacements = {
limit: limit,
table: table,
where: where,
limit,
table,
where
};
if (replacements.where) {
......@@ -335,14 +335,14 @@ var QueryGenerator = {
return Utils._.template(query)(replacements);
},
showIndexesQuery: function(tableName) {
showIndexesQuery(tableName) {
var sql = "EXEC sys.sp_helpindex @objname = N'<%= tableName %>';";
return Utils._.template(sql)({
tableName: this.quoteTable(tableName)
});
},
removeIndexQuery: function(tableName, indexNameOrAttributes) {
removeIndexQuery(tableName, indexNameOrAttributes) {
var sql = 'DROP INDEX <%= indexName %> ON <%= tableName %>'
, indexName = indexNameOrAttributes;
......@@ -358,7 +358,7 @@ var QueryGenerator = {
return Utils._.template(sql)(values);
},
attributeToSQL: function(attribute) {
attributeToSQL(attribute) {
if (!Utils._.isPlainObject(attribute)) {
attribute = {
type: attribute
......@@ -436,7 +436,7 @@ var QueryGenerator = {
return template;
},
attributesToSQL: function(attributes, options) {
attributesToSQL(attributes, options) {
var result = {}
, key
, attribute
......@@ -469,7 +469,7 @@ var QueryGenerator = {
return result;
},
findAutoIncrementField: function(factory) {
findAutoIncrementField(factory) {
var fields = [];
for (var name in factory.attributes) {
if (factory.attributes.hasOwnProperty(name)) {
......@@ -484,36 +484,36 @@ var QueryGenerator = {
return fields;
},
createTrigger: function() {
createTrigger() {
throwMethodUndefined('createTrigger');
},
dropTrigger: function() {
dropTrigger() {
throwMethodUndefined('dropTrigger');
},
renameTrigger: function() {
renameTrigger() {
throwMethodUndefined('renameTrigger');
},
createFunction: function() {
createFunction() {
throwMethodUndefined('createFunction');
},
dropFunction: function() {
dropFunction() {
throwMethodUndefined('dropFunction');
},
renameFunction: function() {
renameFunction() {
throwMethodUndefined('renameFunction');
},
quoteIdentifier: function(identifier, force) {
quoteIdentifier(identifier, force) {
if (identifier === '*') return identifier;
return '[' + identifier.replace(/[\[\]']+/g,'') + ']';
return '[' + identifier.replace(/[\[\]']+/g, '') + ']';
},
getForeignKeysQuery: function(table) {
getForeignKeysQuery(table) {
var tableName = table.tableName || table;
var sql = [
'SELECT',
......@@ -531,7 +531,7 @@ var QueryGenerator = {
return sql;
},
getForeignKeyQuery: function(table, attributeName) {
getForeignKeyQuery(table, attributeName) {
var tableName = table.tableName || table;
var sql = [
'SELECT',
......@@ -542,7 +542,7 @@ var QueryGenerator = {
'ON TC.CONSTRAINT_NAME = CCU.CONSTRAINT_NAME',
"WHERE TC.CONSTRAINT_TYPE = 'FOREIGN KEY'",
'AND TC.TABLE_NAME =', wrapSingleQuote(tableName),
'AND CCU.COLUMN_NAME =', wrapSingleQuote(attributeName),
'AND CCU.COLUMN_NAME =', wrapSingleQuote(attributeName)
].join(' ');
if (table.schema) {
......@@ -552,15 +552,15 @@ var QueryGenerator = {
return sql;
},
dropForeignKeyQuery: function(tableName, foreignKey) {
dropForeignKeyQuery(tableName, foreignKey) {
return Utils._.template('ALTER TABLE <%= table %> DROP <%= key %>')({
table: this.quoteTable(tableName),
key: this.quoteIdentifier(foreignKey)
});
},
getDefaultConstraintQuery: function (tableName, attributeName) {
var sql = "SELECT name FROM SYS.DEFAULT_CONSTRAINTS " +
getDefaultConstraintQuery(tableName, attributeName) {
var sql = 'SELECT name FROM SYS.DEFAULT_CONSTRAINTS ' +
"WHERE PARENT_OBJECT_ID = OBJECT_ID('<%= table %>', 'U') " +
"AND PARENT_COLUMN_ID = (SELECT column_id FROM sys.columns WHERE NAME = ('<%= column %>') " +
"AND object_id = OBJECT_ID('<%= table %>', 'U'));";
......@@ -570,7 +570,7 @@ var QueryGenerator = {
});
},
dropConstraintQuery: function (tableName, constraintName) {
dropConstraintQuery(tableName, constraintName) {
var sql = 'ALTER TABLE <%= table %> DROP CONSTRAINT <%= constraint %>;';
return Utils._.template(sql)({
table: this.quoteTable(tableName),
......@@ -578,12 +578,12 @@ var QueryGenerator = {
});
},
setAutocommitQuery: function(value) {
setAutocommitQuery(value) {
return '';
// return 'SET IMPLICIT_TRANSACTIONS ' + (!!value ? 'OFF' : 'ON') + ';';
},
setIsolationLevelQuery: function(value, options) {
setIsolationLevelQuery(value, options) {
if (options.parent) {
return;
}
......@@ -591,7 +591,7 @@ var QueryGenerator = {
return 'SET TRANSACTION ISOLATION LEVEL ' + value + ';';
},
startTransactionQuery: function(transaction, options) {
startTransactionQuery(transaction, options) {
if (transaction.parent) {
return 'SAVE TRANSACTION ' + this.quoteIdentifier(transaction.name) + ';';
}
......@@ -599,7 +599,7 @@ var QueryGenerator = {
return 'BEGIN TRANSACTION;';
},
commitTransactionQuery: function(transaction) {
commitTransactionQuery(transaction) {
if (transaction.parent) {
return;
}
......@@ -607,7 +607,7 @@ var QueryGenerator = {
return 'COMMIT TRANSACTION;';
},
rollbackTransactionQuery: function(transaction, options) {
rollbackTransactionQuery(transaction, options) {
if (transaction.parent) {
return 'ROLLBACK TRANSACTION ' + this.quoteIdentifier(transaction.name) + ';';
}
......@@ -615,7 +615,7 @@ var QueryGenerator = {
return 'ROLLBACK TRANSACTION;';
},
selectFromTableFragment: function(options, model, attributes, tables, mainTableAs, where) {
selectFromTableFragment(options, model, attributes, tables, mainTableAs, where) {
var topFragment = '';
var mainFragment = 'SELECT ' + attributes.join(', ') + ' FROM ' + tables;
......@@ -669,7 +669,7 @@ var QueryGenerator = {
return mainFragment;
},
addLimitAndOffset: function(options, model) {
addLimitAndOffset(options, model) {
// Skip handling of limit and offset as postfixes for older SQL Server versions
if(semver.valid(this.sequelize.options.databaseVersion) && semver.lt(this.sequelize.options.databaseVersion, '11.0.0')) {
return '';
......@@ -702,7 +702,7 @@ var QueryGenerator = {
return fragment;
},
booleanValue: function(value) {
booleanValue(value) {
return !!value ? 1 : 0;
}
};
......
lib/dialects/mssql/query-interface.js
......@@ -18,13 +18,13 @@
@param {Object} options
@param {Boolean|Function} [options.logging] A function that logs the sql queries, or false for explicitly not logging these queries
*/
var removeColumn = function (tableName, attributeName, options) {
var removeColumn = function(tableName, attributeName, options) {
var self = this;
options = options || {};
var findConstraintSql = self.QueryGenerator.getDefaultConstraintQuery(tableName, attributeName);
return self.sequelize.query(findConstraintSql, { raw: true, logging: options.logging})
.spread(function (results) {
.spread(function(results) {
if (!results.length) {
// No default constraint found -- we can cleanly remove the column
return;
......@@ -32,24 +32,24 @@ var removeColumn = function (tableName, attributeName, options) {
var dropConstraintSql = self.QueryGenerator.dropConstraintQuery(tableName, results[0].name);
return self.sequelize.query(dropConstraintSql, { raw: true, logging: options.logging});
})
.then(function () {
.then(function() {
var findForeignKeySql = self.QueryGenerator.getForeignKeyQuery(tableName, attributeName);
return self.sequelize.query(findForeignKeySql , { raw: true, logging: options.logging});
return self.sequelize.query(findForeignKeySql, { raw: true, logging: options.logging});
})
.spread(function (results) {
.spread(function(results) {
if (!results.length) {
// No foreign key constraints found, so we can remove the column
return;
}
var dropForeignKeySql = self.QueryGenerator.dropForeignKeyQuery(tableName, results[0].constraint_name);
return self.sequelize.query(dropForeignKeySql , { raw: true, logging: options.logging});
return self.sequelize.query(dropForeignKeySql, { raw: true, logging: options.logging});
})
.then(function () {
.then(function() {
var removeSql = self.QueryGenerator.removeColumnQuery(tableName, attributeName);
return self.sequelize.query(removeSql, { raw: true, logging: options.logging});
});
};
module.exports = {
removeColumn: removeColumn
removeColumn
};
lib/dialects/mssql/query.js
......@@ -154,7 +154,7 @@ class Query extends AbstractQuery {
result = {};
for (const _result of data) {
if (_result.Default) {
_result.Default = _result.Default.replace("('",'').replace("')",'').replace(/'/g,''); /* jshint ignore: line */
_result.Default = _result.Default.replace("('", '').replace("')", '').replace(/'/g, ''); /* jshint ignore: line */
}
result[_result.Name] = {
......@@ -267,7 +267,7 @@ class Query extends AbstractQuery {
Utils._.forEach(item.index_keys.split(','), column => {
let columnName = column.trim();
if (columnName.indexOf('(-)') !== -1) {
columnName = columnName.replace('(-)','');
columnName = columnName.replace('(-)', '');
}
acc[item.index_name].fields.push({
......
lib/dialects/mssql/resource-lock.js
......@@ -7,15 +7,15 @@ function ResourceLock(resource) {
this.previous = Promise.resolve(resource);
}
ResourceLock.prototype.unwrap = function () {
ResourceLock.prototype.unwrap = function() {
return this.resource;
};
ResourceLock.prototype.lock = function () {
ResourceLock.prototype.lock = function() {
var lock = this.previous;
var resolve;
this.previous = new Promise(function (r) {
this.previous = new Promise(function(r) {
resolve = r;
});
......
lib/dialects/mysql/connection-manager.js
......@@ -123,7 +123,7 @@ class ConnectionManager extends AbstractConnectionManager {
});
}
debug(`connection acquired`);
debug('connection acquired');
return connection;
})
.then((connection) => {
......@@ -164,7 +164,7 @@ class ConnectionManager extends AbstractConnectionManager {
// Dont disconnect connections with CLOSED state
if (connection._closing) {
debug(`connection tried to disconnect but was already at CLOSED state`);
debug('connection tried to disconnect but was already at CLOSED state');
return Utils.Promise.resolve();
}
......@@ -173,7 +173,7 @@ class ConnectionManager extends AbstractConnectionManager {
if (err) {
reject(new SequelizeErrors.ConnectionError(err));
} else {
debug(`connection disconnected`);
debug('connection disconnected');
resolve();
}
});
......
lib/dialects/mysql/data-types.js
......@@ -31,8 +31,8 @@ module.exports = BaseTypes => {
}
inherits(BLOB, BaseTypes.BLOB);
BLOB.parse = function (value, options, next) {
let data = next();
BLOB.parse = function(value, options, next) {
const data = next();
if (Buffer.isBuffer(data) && data.length === 0) {
return null;
......
lib/dialects/mysql/index.js
......@@ -14,7 +14,7 @@ var MysqlDialect = function(sequelize) {
this.QueryGenerator = _.extend({}, QueryGenerator, {
options: sequelize.options,
_dialect: this,
sequelize: sequelize
sequelize
});
};
......@@ -29,7 +29,7 @@ MysqlDialect.prototype.supports = _.merge(_.cloneDeep(Abstract.prototype.support
length: true,
parser: true,
type: true,
using: 1,
using: 1
},
ignoreDuplicates: ' IGNORE',
updateOnDuplicate: true,
......
lib/dialects/mysql/query-generator.js
......@@ -119,7 +119,7 @@ const QueryGenerator = {
if (definition.match(/REFERENCES/)) {
const fkName = this.quoteIdentifier(tableName + '_' + attributeName + '_foreign_idx');
const attrName = this.quoteIdentifier(attributeName);
definition = definition.replace(/.+?(?=REFERENCES)/,'');
definition = definition.replace(/.+?(?=REFERENCES)/, '');
constraintString.push(`${fkName} FOREIGN KEY (${attrName}) ${definition}`);
} else {
attrString.push('`' + attributeName + '` `' + attributeName + '` ' + definition);
......
lib/dialects/mysql/query.js
......@@ -227,7 +227,7 @@ class Query extends AbstractQuery {
name: item.Key_name,
tableName: item.Table,
unique: (item.Non_unique !== 1),
type: item.Index_type,
type: item.Index_type
}));
}
}
......
lib/dialects/postgres/connection-manager.js
......@@ -110,13 +110,13 @@ class ConnectionManager extends AbstractConnectionManager {
return;
}
responded = true;
debug(`connection acquired`);
debug('connection acquired');
resolve(connection);
});
// If we didn't ever hear from the client.connect() callback the connection timeout, node-postgres does not treat this as an error since no active query was ever emitted
connection.on('end', () => {
debug(`connection timeout`);
debug('connection timeout');
if (!responded) {
reject(new sequelizeErrors.ConnectionTimedOutError(new Error('Connection timed out')));
}
......
lib/dialects/postgres/data-types.js
......@@ -397,7 +397,7 @@ module.exports = BaseTypes => {
3912: 1082, // date
3913: 1082,
3926: 20, // int8
3927: 20,
3927: 20
};
const range = require('./range');
......
lib/dialects/postgres/hstore.js
......@@ -2,13 +2,13 @@
const hstore = require('pg-hstore')({sanitize : true});
function stringify (data) {
function stringify(data) {
if (data === null) return null;
return hstore.stringify(data);
}
exports.stringify = stringify;
function parse (value) {
function parse(value) {
if (value === null) return null;
return hstore.parse(value);
}
......
lib/dialects/postgres/query-generator.js
......@@ -180,7 +180,7 @@ const QueryGenerator = {
},
changeColumnQuery(tableName, attributes) {
let query = 'ALTER TABLE <%= tableName %> ALTER COLUMN <%= query %>;';
const query = 'ALTER TABLE <%= tableName %> ALTER COLUMN <%= query %>;';
const sql = [];
for (const attributeName in attributes) {
......@@ -231,7 +231,7 @@ const QueryGenerator = {
}
if (definition.match(/REFERENCES/)) {
definition = definition.replace(/.+?(?=REFERENCES)/,'');
definition = definition.replace(/.+?(?=REFERENCES)/, '');
attrSql += Utils._.template(query.replace('ALTER COLUMN', ''))({
tableName: this.quoteTable(tableName),
query: 'ADD CONSTRAINT ' + this.quoteIdentifier(attributeName + '_foreign_idx') + ' FOREIGN KEY (' + this.quoteIdentifier(attributeName) + ') ' + definition
......
lib/dialects/postgres/query.js
......@@ -194,7 +194,7 @@ class Query extends AbstractQuery {
m[k.toLowerCase()] = k;
return m;
}, {});
rows = _.map(rows,(row)=> {
rows = _.map(rows, (row)=> {
return _.mapKeys(row, (value, key)=> {
const targetAttr = attrsMap[key];
if (typeof targetAttr === 'string' && targetAttr !== key) {
......
lib/dialects/postgres/range.js
......@@ -2,7 +2,7 @@
const _ = require('lodash');
function stringifyRangeBound (bound) {
function stringifyRangeBound(bound) {
if (bound === null) {
return '' ;
} else if (bound === Infinity || bound === -Infinity) {
......@@ -12,7 +12,7 @@ function stringifyRangeBound (bound) {
}
}
function parseRangeBound (bound, parseType) {
function parseRangeBound(bound, parseType) {
if (!bound) {
return null;
} else if (bound === 'infinity') {
......@@ -24,7 +24,7 @@ function parseRangeBound (bound, parseType) {
}
}
function stringify (data) {
function stringify(data) {
if (data === null) return null;
if (!_.isArray(data)) throw new Error('range must be an array');
......@@ -53,7 +53,7 @@ function stringify (data) {
}
exports.stringify = stringify;
function parse (value, parser) {
function parse(value, parser) {
if (value === null) return null;
if (value === 'empty') {
const empty = [];
......
lib/dialects/sqlite/query.js
......@@ -357,7 +357,7 @@ class Query extends AbstractQuery {
item.fields[column.seqno] = {
attribute: column.name,
length: undefined,
order: undefined,
order: undefined
};
}
......
lib/hooks.js
......@@ -227,7 +227,7 @@ const Hooks = {
*/
hasHook(hookType) {
return this.options.hooks[hookType] && !!this.options.hooks[hookType].length;
},
}
};
Hooks.hasHooks = Hooks.hasHook;
......
lib/model.js
......@@ -1146,11 +1146,11 @@ class Model {
}
}
if (!!scope) {
if (scope) {
_.assignWith(self._scope, scope, (objectValue, sourceValue, key) => {
if (key === 'where') {
return Array.isArray(sourceValue) ? sourceValue : _.assign(objectValue || {}, sourceValue);
} else if ( (['attributes','include'].indexOf(key) >= 0) && Array.isArray(objectValue) && Array.isArray(sourceValue)) {
} else if (['attributes', 'include'].indexOf(key) >= 0 && Array.isArray(objectValue) && Array.isArray(sourceValue)) {
return objectValue.concat(sourceValue);
}
......@@ -1287,7 +1287,7 @@ class Model {
// forgot to pass options.where ?
if (!options.where) {
let commonKeys = _.intersection(_.keys(options), _.keys(this.rawAttributes));
const commonKeys = _.intersection(_.keys(options), _.keys(this.rawAttributes));
// jshint -W030
commonKeys.length && Utils.warn(`Model attributes (${commonKeys.join(',')}) found in finder method options but options.where object is empty. Did you forget to use options.where?`);
}
......@@ -1944,10 +1944,10 @@ class Model {
options.fields = Object.keys(values);
}
const createdAtAttr = this._timestampAttributes.createdAt
, updatedAtAttr = this._timestampAttributes.updatedAt
, hadPrimary = this.primaryKeyField in values || this.primaryKeyAttribute in values
, instance = this.build(values);
const createdAtAttr = this._timestampAttributes.createdAt;
const updatedAtAttr = this._timestampAttributes.updatedAt;
const hadPrimary = this.primaryKeyField in values || this.primaryKeyAttribute in values;
const instance = this.build(values);
return instance.validate(options).then(() => {
// Map field names
......@@ -1975,9 +1975,9 @@ class Model {
if (options.hooks) {
return this.runHooks('beforeUpsert', values, options);
}
}).then(() => (
this.QueryInterface.upsert(this.getTableName(options), insertValues, updateValues, instance.where(), this, options)
)).tap(result => {
}).then(() => {
return this.QueryInterface.upsert(this.getTableName(options), insertValues, updateValues, instance.where(), this, options);
}).tap(result => {
if (options.hooks) {
return this.runHooks('afterUpsert', result, options);
}
......@@ -2057,8 +2057,8 @@ class Model {
}).then(() => {
// Validate
if (options.validate) {
const errors = new Promise.AggregateError()
, validateOptions = _.clone(options);
const errors = new Promise.AggregateError();
const validateOptions = _.clone(options);
validateOptions.hooks = options.individualHooks;
return Promise.map(instances, instance =>
......@@ -2075,7 +2075,7 @@ class Model {
}).then(() => {
/* jshint -W030 */
for (const instance of instances) {
let values = instance.dataValues;
const values = instance.dataValues;
// set createdAt/updatedAt attributes
if (createdAtAttr && !values[createdAtAttr]) {
......@@ -2230,10 +2230,10 @@ class Model {
}).then(() => {
// Run delete query (or update if paranoid)
if (this._timestampAttributes.deletedAt && !options.force) {
const attrValueHash = {}
, deletedAtAttribute = this.rawAttributes[this._timestampAttributes.deletedAt]
, field = this.rawAttributes[this._timestampAttributes.deletedAt].field
, where = {};
const attrValueHash = {};
const deletedAtAttribute = this.rawAttributes[this._timestampAttributes.deletedAt];
const field = this.rawAttributes[this._timestampAttributes.deletedAt].field;
const where = {};
where[field] = deletedAtAttribute.hasOwnProperty('defaultValue') ? deletedAtAttribute.defaultValue : null;
......@@ -2669,7 +2669,7 @@ class Model {
if (this.constructor._hasDefaultValues) {
defaults = _.mapValues(this.constructor._defaultValues, valueFn => {
const value = valueFn();
return (value && value._isSequelizeMethod) ? value : _.cloneDeep(value);
return value && value._isSequelizeMethod ? value : _.cloneDeep(value);
});
}
......@@ -2961,11 +2961,11 @@ class Model {
if (_.isString(value)) {
// Only take action on valid boolean strings.
value = (value === 'true') ? true : (value === 'false') ? false : value;
value = value === 'true' ? true : value === 'false' ? false : value;
} else if (_.isNumber(value)) {
// Only take action on valid boolean integers.
value = (value === 1) ? true : (value === 0) ? false : value;
value = value === 1 ? true : value === 0 ? false : value;
}
}
......
lib/promise.js
......@@ -7,7 +7,7 @@ const shimmer = require('shimmer');
// fnArgs: The arguments index that should be CLS enabled (typically all callbacks). Offset from last if negative
function shimCLS(object, functionName, fnArgs){
shimmer.wrap(object, functionName, fn => {
return function () {
return function() {
if (Promise.Sequelize && Promise.Sequelize.cls) {
const ns = Promise.Sequelize.cls;
for(let x = 0; x < fnArgs.length; x++) {
......
lib/query-types.js
......@@ -13,5 +13,5 @@ module.exports = {
SHOWINDEXES: 'SHOWINDEXES',
DESCRIBE: 'DESCRIBE',
RAW: 'RAW',
FOREIGNKEYS: 'FOREIGNKEYS',
FOREIGNKEYS: 'FOREIGNKEYS'
};
lib/sequelize.js
......@@ -118,7 +118,7 @@ class Sequelize {
// new Sequelize({ ... options })
options = database;
config = _.pick(options, 'host', 'port', 'database', 'username', 'password');
} else if ((arguments.length === 1 && typeof database === 'string') || (arguments.length === 2 && typeof username === 'object')) {
} else if (arguments.length === 1 && typeof database === 'string' || arguments.length === 2 && typeof username === 'object') {
// new Sequelize(URI, { ... options })
config = {};
......@@ -198,7 +198,7 @@ class Sequelize {
this.options.hooks = this.replaceHookAliases(this.options.hooks);
if ((['', null, false].indexOf(config.password) > -1) || (typeof config.password === 'undefined')) {
if (['', null, false].indexOf(config.password) > -1 || typeof config.password === 'undefined') {
config.password = null;
}
......@@ -451,7 +451,7 @@ class Sequelize {
*/
isDefined(modelName) {
const models = this.modelManager.models;
return (models.filter(model => model.name === modelName).length !== 0);
return models.filter(model => model.name === modelName).length !== 0;
}
/**
......@@ -474,7 +474,7 @@ class Sequelize {
}
if (!this.importCache[path]) {
let defineCall = (arguments.length > 1 ? arguments[1] : require(path));
let defineCall = arguments.length > 1 ? arguments[1] : require(path);
if (typeof defineCall === 'object' && defineCall.__esModule) {
// Babel/ES6 module compatability
defineCall = defineCall['default'];
......@@ -593,7 +593,7 @@ class Sequelize {
options = _.defaults(options, {
logging: this.options.hasOwnProperty('logging') ? this.options.logging : console.log,
searchPath: this.options.hasOwnProperty('searchPath') ? this.options.searchPath : 'DEFAULT',
searchPath: this.options.hasOwnProperty('searchPath') ? this.options.searchPath : 'DEFAULT'
});
if (options.transaction === undefined && Sequelize.cls) {
......@@ -1057,11 +1057,11 @@ class Sequelize {
autoCallback = ns.bind(autoCallback);
}
const result = autoCallback(transaction);
if (!result || !result.then) throw new Error('You need to return a promise chain/thenable to the sequelize.transaction() callback');
const returnValue = autoCallback(transaction);
if (!returnValue || !returnValue.then) throw new Error('You need to return a promise chain/thenable to the sequelize.transaction() callback');
return result.then(result => transaction.commit()).then(() => {
resolve(result);
return returnValue.then(result => transaction.commit()).then(() => {
resolve(returnValue);
});
}).catch(err => {
// If the transaction has already finished (commit, rollback, etc), reject with the original error
......
lib/transaction.js
......@@ -125,7 +125,7 @@ class Transaction {
.startTransaction(this, this.options);
}
setDeferrable () {
setDeferrable() {
if (this.options.deferrable) {
return this
.sequelize
......@@ -154,7 +154,7 @@ class Transaction {
return res;
}
_clearCls () {
_clearCls() {
const cls = this.sequelize.constructor.cls;
if (cls) {
......
lib/utils.js
......@@ -10,7 +10,7 @@ const Promise = require('./promise');
const primitives = ['string', 'number', 'boolean'];
let inflection = require('inflection');
let logger = new Logger();
const logger = new Logger();
exports.Promise = Promise;
exports._ = _;
......
lib/utils/parameter-validator.js
......@@ -3,7 +3,7 @@
const _ = require('lodash');
const util = require('util');
function validateDeprecation (value, expectation, options) {
function validateDeprecation(value, expectation, options) {
if (!options.deprecated) {
return;
}
......@@ -19,7 +19,7 @@ function validateDeprecation (value, expectation, options) {
return valid;
}
function validate (value, expectation) {
function validate(value, expectation) {
// the second part of this check is a workaround to deal with an issue that occurs in node-webkit when
// using object literals. https://github.com/sequelize/sequelize/issues/2685
if (value instanceof expectation || Object.prototype.toString.call(value) === Object.prototype.toString.call(expectation.call())) {
......@@ -29,7 +29,7 @@ function validate (value, expectation) {
throw new Error(`The parameter (value: ${value}) is no ${expectation.name}`);
}
function check (value, expectation, options) {
function check(value, expectation, options) {
options = _.extend({
deprecated: false,
index: null,
......
lib/utils/validator-extras.js
......@@ -59,7 +59,7 @@ const extensions = {
},
is(str, pattern, modifiers) {
return this.regex(str, pattern, modifiers);
},
}
};
exports.extensions = extensions;
......@@ -67,7 +67,7 @@ function extendModelValidations(modelInstance) {
const extensions = {
isImmutable(str, param, field) {
return (modelInstance.isNewRecord || modelInstance.dataValues[field] === modelInstance._previousDataValues[field]);
},
}
};
_.forEach(extensions, (extend, key) => {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!