fix: JSON fields handling for MariaDB

server/core/config.js

@@ -19,7 +19,7 @@ module.exports = {
     }
 
     if (process.env.dockerdev) {
-      confPaths.config = path.join(WIKI.ROOTPATH, 'dev/docker/config.yml')
+      confPaths.config = path.join(WIKI.ROOTPATH, `dev/docker-${process.env.DEVDB}/config.yml`)
     }
 
     process.stdout.write(chalk.blue(`Loading configuration from ${confPaths.config}... `))

server/core/localization.js

@@ -84,7 +84,7 @@ module.exports = {
       throw new Error('No such locale in local store.')
     }
 
-    //-> Load dev locale files if present
+    // -> Load dev locale files if present
     if (WIKI.IS_DEBUG) {
       try {
         const devEntriesRaw = await fs.readFileAsync(path.join(WIKI.SERVERPATH, `locales/${locale}.yml`), 'utf8')

server/models/authentication.js

@@ -22,14 +22,15 @@ module.exports = class Authentication extends Model {
       properties: {
         key: {type: 'string'},
         isEnabled: {type: 'boolean'},
-        config: {type: 'object'},
-        selfRegistration: {type: 'boolean'},
-        domainWhitelist: {type: 'object'},
-        autoEnrollGroups: {type: 'object'}
+        selfRegistration: {type: 'boolean'}
       }
     }
   }
 
+  static get jsonAttributes() {
+    return ['config', 'domainWhitelist', 'autoEnrollGroups']
+  }
+
   static async getStrategy(key) {
     return WIKI.models.authentication.query().findOne({ key })
   }

server/models/editors.js

@@ -21,12 +21,15 @@ module.exports = class Editor extends Model {
 
       properties: {
         key: {type: 'string'},
-        isEnabled: {type: 'boolean'},
-        config: {type: 'object'}
+        isEnabled: {type: 'boolean'}
       }
     }
   }
 
+  static get jsonAttributes() {
+    return ['config']
+  }
+
   static async getEditors() {
     return WIKI.models.editors.query()
   }

server/models/groups.js

@@ -20,6 +20,10 @@ module.exports = class Group extends Model {
     }
   }
 
+  static get jsonAttributes() {
+    return ['permissions', 'pageRules']
+  }
+
   static get relationMappings() {
     return {
       users: {

server/models/locales.js

@@ -3,7 +3,7 @@ const Model = require('objection').Model
 /**
  * Locales model
  */
-module.exports = class User extends Model {
+module.exports = class Locale extends Model {
   static get tableName() { return 'locales' }
   static get idColumn() { return 'code' }
 
@@ -14,7 +14,6 @@ module.exports = class User extends Model {
 
       properties: {
         code: {type: 'string'},
-        strings: {type: 'object'},
         isRTL: {type: 'boolean', default: false},
         name: {type: 'string'},
         nativeName: {type: 'string'},
@@ -24,6 +23,10 @@ module.exports = class User extends Model {
     }
   }
 
+  static get jsonAttributes() {
+    return ['strings']
+  }
+
   $beforeUpdate() {
     this.updatedAt = new Date().toISOString()
   }

server/models/loggers.js

@@ -22,12 +22,15 @@ module.exports = class Logger extends Model {
       properties: {
         key: {type: 'string'},
         isEnabled: {type: 'boolean'},
-        level: {type: 'string'},
-        config: {type: 'object'}
+        level: {type: 'string'}
       }
     }
   }
 
+  static get jsonAttributes() {
+    return ['config']
+  }
+
   static async getLoggers() {
     return WIKI.models.loggers.query()
   }

server/models/renderers.js

@@ -22,12 +22,15 @@ module.exports = class Renderer extends Model {
 
       properties: {
         key: {type: 'string'},
-        isEnabled: {type: 'boolean'},
-        config: {type: 'object'}
+        isEnabled: {type: 'boolean'}
       }
     }
   }
 
+  static get jsonAttributes() {
+    return ['config']
+  }
+
   static async getRenderers() {
     return WIKI.models.renderers.query()
   }

server/models/searchEngines.js

@@ -22,12 +22,15 @@ module.exports = class SearchEngine extends Model {
       properties: {
         key: {type: 'string'},
         isEnabled: {type: 'boolean'},
-        level: {type: 'string'},
-        config: {type: 'object'}
+        level: {type: 'string'}
       }
     }
   }
 
+  static get jsonAttributes() {
+    return ['config']
+  }
+
   static async getSearchEngines() {
     return WIKI.models.searchEngines.query()
   }

server/models/settings.js

@@ -13,17 +13,20 @@ module.exports = class Setting extends Model {
   static get jsonSchema () {
     return {
       type: 'object',
-      required: ['key', 'value'],
+      required: ['key'],
 
       properties: {
         key: {type: 'string'},
-        value: {type: 'object'},
         createdAt: {type: 'string'},
         updatedAt: {type: 'string'}
       }
     }
   }
 
+  static get jsonAttributes() {
+    return ['value']
+  }
+
   $beforeUpdate() {
     this.updatedAt = new Date().toISOString()
   }

server/models/storage.js

@@ -24,12 +24,15 @@ module.exports = class Storage extends Model {
       properties: {
         key: {type: 'string'},
         isEnabled: {type: 'boolean'},
-        mode: {type: 'string'},
-        config: {type: 'object'}
+        mode: {type: 'string'}
       }
     }
   }
 
+  static get jsonAttributes() {
+    return ['config']
+  }
+
   static async getTargets() {
     return WIKI.models.storage.query()
   }