Skip to content

Commit 777ee75

Browse files
committed
deprecated operatorsAliases
1 parent 87f3964 commit 777ee75

7 files changed

Lines changed: 17 additions & 9 deletions

File tree

config/config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ config.development = {
88
host: process.env.RDS_HOST || "127.0.0.1",
99
port: process.env.RDS_PORT || 3306,
1010
dialect: "mysql",
11-
logging: false
11+
logging: false,
12+
operatorsAliases: false,
1213
},
1314
// Config for qiniu (http://www.qiniu.com/) cloud storage when storageType value is "qiniu".
1415
qiniu: {

config/config.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ config.test = {
99
host: "127.0.0.1",
1010
port: 3306,
1111
dialect: "mysql",
12-
logging: false
12+
logging: false,
13+
operatorsAliases: false,
1314
},
1415
local: {
1516
storageDir: os.tmpdir(),

config/config.testwin.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ config.test = {
99
host: "127.0.0.1",
1010
port: 3306,
1111
dialect: "mysql",
12-
logging: false
12+
logging: false,
13+
operatorsAliases: false,
1314
},
1415
local: {
1516
storageDir: os.tmpdir(),

core/middleware.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ var checkAuthToken = function (authToken) {
1717
if (_.isEmpty(users)) {
1818
throw new AppError.Unauthorized();
1919
}
20+
var Sequelize = require('sequelize');
2021
return models.UserTokens.findOne({
21-
where: {tokens: authToken, uid: users.id, expires_at: { gt: moment().format('YYYY-MM-DD HH:mm:ss') }}
22+
where: {tokens: authToken, uid: users.id, expires_at: { [Sequelize.Op.gt]: moment().format('YYYY-MM-DD HH:mm:ss') }}
2223
})
2324
.then((tokenInfo) => {
2425
if (_.isEmpty(tokenInfo)){

core/services/app-manager.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ proto.listApps = function (uid) {
9191
return [];
9292
} else {
9393
var appIds = _.map(data, (v) => { return v.appid });
94-
return models.Apps.findAll({where: {id: {in: appIds}}});
94+
var Sequelize = require('sequelize');
95+
return models.Apps.findAll({where: {id: {[Sequelize.Op.in]: appIds}}});
9596
}
9697
})
9798
.then((appInfos) => {

core/services/collaborators.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ proto.listCollaborators = function (appId) {
2121
}, []);
2222
})
2323
.then((coInfo) => {
24-
return models.Users.findAll({where: {id: {in: coInfo.uids}}})
24+
var Sequelize = require('sequelize');
25+
return models.Users.findAll({where: {id: {[Sequelize.Op.in]: coInfo.uids}}})
2526
.then((data2) => {
2627
return _.reduce(data2, function (result, value, key) {
2728
var permission = "";

core/services/package-manager.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,18 +232,19 @@ proto.createDiffPackagesByLastNums = function (packageId, num) {
232232
if (_.isEmpty(originalPackage)) {
233233
throw AppError.AppError('can\'t find Package');
234234
}
235+
var Sequelize = require('sequelize');
235236
return Promise.all([
236237
models.Packages.findAll({
237238
where:{
238239
deployment_version_id: originalPackage.deployment_version_id,
239-
id: {$lt: packageId}},
240+
id: {[Sequelize.Op.lt]: packageId}},
240241
order: [['id','desc']],
241242
limit: num
242243
}),
243244
models.Packages.findAll({
244245
where:{
245246
deployment_version_id: originalPackage.deployment_version_id,
246-
id: {$lt: packageId}},
247+
id: {[Sequelize.Op.lt]: packageId}},
247248
order: [['id','asc']],
248249
limit: 2
249250
})
@@ -495,7 +496,8 @@ proto.rollbackPackage = function (deploymentVersionId, targetLabel, rollbackUid)
495496
}
496497

497498
proto.getCanRollbackPackages = function (deploymentVersionId) {
499+
var Sequelize = require('sequelize');
498500
return models.Packages.findAll({
499-
where: {deployment_version_id: deploymentVersionId, release_method: {$in: ['Upload', 'Promote'] }}, order: [['id','desc']], limit: 2
501+
where: {deployment_version_id: deploymentVersionId, release_method: {[Sequelize.Op.in]: ['Upload', 'Promote'] }}, order: [['id','desc']], limit: 2
500502
});
501503
}

0 commit comments

Comments
 (0)