summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWu Cheng-Han2017-01-02 11:05:05 +0800
committerWu Cheng-Han2017-01-02 11:05:05 +0800
commitd9e19b602968551fcda4ee806d767a04f6a11490 (patch)
tree788b3f708545b2875f115c5716b7849c1cc9ad03 /lib
parentc3a96ff112c8f7ea31af97fbc3319e782f4490e2 (diff)
Update to remove null byte before saving to DB and remove null byte on changes
Diffstat (limited to 'lib')
-rw-r--r--lib/models/index.js7
-rw-r--r--lib/models/note.js15
-rw-r--r--lib/models/revision.js20
3 files changed, 35 insertions, 7 deletions
diff --git a/lib/models/index.js b/lib/models/index.js
index de6cd13c..6d0fd3c3 100644
--- a/lib/models/index.js
+++ b/lib/models/index.js
@@ -20,6 +20,13 @@ if (config.dburl)
else
sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
+// [Postgres] Handling NULL bytes
+// https://github.com/sequelize/sequelize/issues/6485
+function stripNullByte(value) {
+ return value ? value.replace(/\u0000/g, "") : value;
+}
+sequelize.stripNullByte = stripNullByte;
+
var db = {};
fs
diff --git a/lib/models/note.js b/lib/models/note.js
index 81de991f..37d26ec0 100644
--- a/lib/models/note.js
+++ b/lib/models/note.js
@@ -52,13 +52,22 @@ module.exports = function (sequelize, DataTypes) {
defaultValue: 0
},
title: {
- type: DataTypes.TEXT
+ type: DataTypes.TEXT,
+ set: function (value) {
+ this.setDataValue('title', sequelize.stripNullByte(value));
+ }
},
content: {
- type: DataTypes.TEXT
+ type: DataTypes.TEXT,
+ set: function (value) {
+ this.setDataValue('content', sequelize.stripNullByte(value));
+ }
},
authorship: {
- type: DataTypes.TEXT
+ type: DataTypes.TEXT,
+ set: function (value) {
+ this.setDataValue('authorship', JSON.stringify(value));
+ }
},
lastchangeAt: {
type: DataTypes.DATE
diff --git a/lib/models/revision.js b/lib/models/revision.js
index 6f44cf1d..adc651f1 100644
--- a/lib/models/revision.js
+++ b/lib/models/revision.js
@@ -59,19 +59,31 @@ module.exports = function (sequelize, DataTypes) {
defaultValue: Sequelize.UUIDV4
},
patch: {
- type: DataTypes.TEXT
+ type: DataTypes.TEXT,
+ set: function (value) {
+ this.setDataValue('patch', sequelize.stripNullByte(value));
+ }
},
lastContent: {
- type: DataTypes.TEXT
+ type: DataTypes.TEXT,
+ set: function (value) {
+ this.setDataValue('lastContent', sequelize.stripNullByte(value));
+ }
},
content: {
- type: DataTypes.TEXT
+ type: DataTypes.TEXT,
+ set: function (value) {
+ this.setDataValue('content', sequelize.stripNullByte(value));
+ }
},
length: {
type: DataTypes.INTEGER
},
authorship: {
- type: DataTypes.TEXT
+ type: DataTypes.TEXT,
+ set: function (value) {
+ this.setDataValue('authorship', value ? JSON.stringify(value) : value);
+ }
}
}, {
classMethods: {