ncov / back

Go to a project
Toggle navigation Toggle navigation pinning
lintry
3526e0f2 1 parent 54dbbf26

更新sequelize的初始化设置

Inline Side-by-side
Showing 1 changed file with 6 additions and 8 deletions
...@@ -9,6 +9,10 @@ global.sequelize = global.sequelize = function () { ...@@ -9,6 +9,10 @@ global.sequelize = global.sequelize = function () {
9 9
10 const config = require('./config'), config_sequelize = config.sequelize; 10 const config = require('./config'), config_sequelize = config.sequelize;
11 11
12 + // 处理浮点数及大整型数据返回时不转换成String
13 + Sequelize.postgres.DECIMAL.parse = function (value) { return parseFloat(value); };
14 + Sequelize.postgres.BIGINT.parse = function (value) { return parseInt(value); };
15 +
12 //custom method defined here 16 //custom method defined here
13 config_sequelize.options.define = { 17 config_sequelize.options.define = {
14 classMethods: { 18 classMethods: {
...@@ -24,7 +28,7 @@ global.sequelize = global.sequelize = function () { ...@@ -24,7 +28,7 @@ global.sequelize = global.sequelize = function () {
24 28
25 //根据主键查找是否存在 29 //根据主键查找是否存在
26 let primaryKey = Entity.primaryKeyAttribute; 30 let primaryKey = Entity.primaryKeyAttribute;
27 - return Entity.findById(entityRequest[primaryKey]) 31 + return Entity.findByPk(entityRequest[primaryKey], options)
28 .then(function (entity) { 32 .then(function (entity) {
29 if (entity) { //to update 33 if (entity) { //to update
30 return entity.update(entityRequest, options); 34 return entity.update(entityRequest, options);
...@@ -52,7 +56,7 @@ global.sequelize = global.sequelize = function () { ...@@ -52,7 +56,7 @@ global.sequelize = global.sequelize = function () {
52 } 56 }
53 //根据主键查找是否存在 57 //根据主键查找是否存在
54 let primaryKey = Entity.primaryKeyAttribute; 58 let primaryKey = Entity.primaryKeyAttribute;
55 - return Entity.findById(entityRequest[primaryKey]) 59 + return Entity.findByPk(entityRequest[primaryKey], options)
56 .then(function (entity) { 60 .then(function (entity) {
57 if (entity) { //to update 61 if (entity) { //to update
58 return entity.update(entityRequest, options); 62 return entity.update(entityRequest, options);
...@@ -83,12 +87,6 @@ global.sequelize = global.sequelize = function () { ...@@ -83,12 +87,6 @@ global.sequelize = global.sequelize = function () {
83 logger.info('db init finished!'); 87 logger.info('db init finished!');
84 } 88 }
85 89
86 - // 兼容4.0模式，添加属性
87 - sequelize.Op = Sequelize.Op;
88 - sequelize.Transaction = Sequelize.Transaction;
89 - sequelize.Model = Sequelize.Model;
90 - sequelize.Utils = Sequelize.Utils;
91 -
92 return sequelize; 90 return sequelize;
93 }(); 91 }();
94 92
......