Skip to content

Update sequelize to 6.3.5 #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update sequelize to 6.3.5 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/dao/db/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ databases.forEach((database) => {

dbModels.forEach(async function (dbModel) {
let tableName = dbModel.replace(/\.js$/g, '');
tableObj[_.camelCase(tableName)] = sequelize.import(dbModelsPath + '/' + tableName);
tableObj[_.camelCase(tableName)] = require(`${dbModelsPath}/${tableName}`)(sequelize, Sequelize);

try {

Expand Down
2 changes: 1 addition & 1 deletion app/service/gateway/GatewayObjManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class GatewayObjManager{
let dbModels = fs.readdirSync(dbModelsPath);
dbModels.forEach(function (dbModel) {
let tableName = dbModel.replace(/\.js$/g, '');
dbObj[_.camelCase(tableName)] = sequelize.import(dbModelsPath + '/' + tableName);
dbObj[_.camelCase(tableName)] = require(`${dbModelsPath}/${tableName}`)(sequelize, Sequelize);
dbObj[_.camelCase(tableName)].sync({ alter: false });
})
dbObj.seq = sequelize
Expand Down
2 changes: 1 addition & 1 deletion dcache/db/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ databases.forEach((database) => {
dbModels.forEach(async (dbModel) => {
const tableName = dbModel.replace(/\.js$/g, '');
try {
tableObj[_.camelCase(tableName)] = sequelize.import(`${dbModelsPath}/${tableName}`);
tableObj[_.camelCase(tableName)] = require(`${dbModelsPath}/${tableName}`)(sequelize, Sequelize);
// sync 无表创建表， alter 新增字段
// tableObj[_.camelCase(tableName)].sync();
await tableObj[_.camelCase(tableName)].sync({ alter: true });
Expand Down
2 changes: 1 addition & 1 deletion dcache/db/index_tpl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ module.exports = {
dbModels.forEach(async (dbModel) => {
const tableName = dbModel.replace(/\.js$/g, '');
try {
tableObj[_.camelCase(tableName)] = sequelize.import(`${dbModelsPath}/${tableName}`);
tableObj[_.camelCase(tableName)] = require(`${dbModelsPath}/${tableName}`)(sequelize, Sequelize);
// sync 无表创建表， alter 新增字段
// tableObj[_.camelCase(tableName)].sync();
await tableObj[_.camelCase(tableName)].sync({ alter: true });
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"q": "^1.5.1",
"request": "^2.87.0",
"request-promise-any": "^1.0.5",
"sequelize": "^5.21.2",
"sequelize": "^6.3.5",
"sha1": "^1.1.1",
"svg-captcha": "^1.4.0",
"url": "^0.11.0",
Expand Down
2 changes: 1 addition & 1 deletion sso/app/dao/db/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ databases.forEach((database)=>{

let tableName = dbModel.replace(/\.js$/g, '');
try {
tableObj[_.camelCase(tableName)] = sequelize.import(dbModelsPath + '/' + tableName);
tableObj[_.camelCase(tableName)] = require(`${dbModelsPath}/${tableName}`)(sequelize, Sequelize);
await tableObj[_.camelCase(tableName)].sync({alter: true});

logger.info('database ' + database + '.' + tableName + ' sync succ');
Expand Down