@waline/vercel 1.18.6 → 1.18.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.18.6",
+  "version": "1.18.7",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -24,13 +24,13 @@
     "fast-csv": "4.3.6",
     "jsdom": "19.0.0",
     "jsonwebtoken": "8.5.1",
-    "katex": "0.15.6",
+    "katex": "0.16.0",
     "leancloud-storage": "4.12.2",
     "markdown-it": "13.0.1",
     "markdown-it-emoji": "2.0.2",
     "markdown-it-sub": "1.0.0",
     "markdown-it-sup": "1.0.0",
-    "mathjax-full": "3.2.1",
+    "mathjax-full": "3.2.2",
     "nodemailer": "6.7.5",
     "nunjucks": "3.2.3",
     "phpass": "0.1.1",

package/src/controller/db.js

@@ -3,6 +3,24 @@ const util = require('util');
 const BaseRest = require('./rest');
 
 const readFileAsync = util.promisify(fs.readFile);
+
+function formatID(data, idGenerator) {
+  const objectIdMap = {};
+  for (let i = 0; i < data.length; i++) {
+    const { objectId } = data[i];
+    objectIdMap[objectId] = idGenerator(data[i], i, data);
+  }
+
+  for (let i = 0; i < data.length; i++) {
+    ['objectId', 'pid', 'rid']
+      .filter((k) => data[i][k])
+      .forEach((k) => {
+        data[i][k] = objectIdMap[data[i][k]];
+      });
+  }
+
+  return data;
+}
 module.exports = class extends BaseRest {
   async getAction() {
     const exportData = {
@@ -43,11 +61,17 @@ module.exports = class extends BaseRest {
         const storage = this.config('storage');
         const model = this.service(`storage/${storage}`, tableName);
 
+        let data = importData.data[tableName];
+        if (['postgresql', 'mysql', 'sqlite'].includes(storage)) {
+          let i = 0;
+          data = formatID(data, () => (i = i + 1));
+        }
+
         // delete all data at first
         await model.delete({});
         // then add data one by one
-        for (let j = 0; j < importData.data[tableName].length; j++) {
-          await model.add(importData.data[tableName][j]);
+        for (let j = 0; j < data.length; j++) {
+          await model.add(data[j]);
         }
       }
       return this.success();

package/src/service/storage/postgresql.js

@@ -23,6 +23,20 @@ module.exports = class extends MySQL {
     });
   }
 
+  async add(data) {
+    ['insertedAt', 'createdAt', 'updatedAt']
+      .filter((key) => data[key])
+      .forEach((key) => {
+        const val = data[key];
+        data[key.toLowerCase()] =
+          val instanceof Date
+            ? think.datetime(val, 'YYYY-MM-DD HH:mm:ss')
+            : val;
+        delete data[key];
+      });
+    return super.add(data);
+  }
+
   async count(...args) {
     let result = await super.count(...args);
     try {