fix: sqlite migrations

CHANGELOG.md

@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.0.0-beta.XX] - 2018-XX-XX
+## [2.0.0-beta.42] - 2018-02-17
 ### Added
 - Added Patreon link in Contribute admin page
 - Added Theme Code Injection functionality
@@ -27,5 +27,5 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [2.0.0-beta.11] - 2018-01-20
 - First beta release
 
-[2.0.0-beta.12]: https://github.com/Requarks/wiki/releases/tag/2.0.0-beta.12
+[2.0.0-beta.42]: https://github.com/Requarks/wiki/releases/tag/2.0.0-beta.42
 [2.0.0-beta.11]: https://github.com/Requarks/wiki/releases/tag/2.0.0-beta.11

dev/docker-sqlite/Dockerfile

@@ -11,7 +11,6 @@ RUN apk update && \
 WORKDIR /wiki
 COPY package.json .
 RUN yarn --silent
-COPY ./dev/docker-sqlite/init.sh ./init.sh
 
 ENV dockerdev 1
 ENV DEVDB sqlite

server/core/kernel.js

@@ -11,8 +11,16 @@ module.exports = {
 
     WIKI.models = require('./db').init()
 
+    try {
       await WIKI.models.onReady
       await WIKI.configSvc.loadFromDb()
+    } catch (err) {
+      WIKI.logger.error('Database Initialization Error: ' + err.message)
+      if (WIKI.IS_DEBUG) {
+        console.error(err)
+      }
+      process.exit(1)
+    }
 
     this.bootMaster()
   },

server/db/migrations-sqlite/2.0.0-beta.11.js

+exports.up = knex => {
+  return knex.schema
+    .renameTable('pageHistory', 'pageHistory_old')
+    .createTable('pageHistory', table => {
+      table.increments('id').primary()
+      table.string('path').notNullable()
+      table.string('hash').notNullable()
+      table.string('title').notNullable()
+      table.string('description')
+      table.boolean('isPrivate').notNullable().defaultTo(false)
+      table.boolean('isPublished').notNullable().defaultTo(false)
+      table.string('publishStartDate')
+      table.string('publishEndDate')
+      table.text('content')
+      table.string('contentType').notNullable()
+      table.string('createdAt').notNullable()
+      table.string('action').defaultTo('updated')
+
+      table.string('editorKey').references('key').inTable('editors')
+      table.string('localeCode', 2).references('code').inTable('locales')
+      table.integer('authorId').unsigned().references('id').inTable('users')
+    })
+    .raw(`INSERT INTO pageHistory SELECT id,path,hash,title,description,isPrivate,isPublished,publishStartDate,publishEndDate,content,contentType,createdAt,'updated' AS action,editorKey,localeCode,authorId FROM pageHistory_old;`)
+    .dropTable('pageHistory_old')
+}
+
+exports.down = knex => {
+  return knex.schema
+    .renameTable('pageHistory', 'pageHistory_old')
+    .createTable('pageHistory', table => {
+      table.increments('id').primary()
+      table.string('path').notNullable()
+      table.string('hash').notNullable()
+      table.string('title').notNullable()
+      table.string('description')
+      table.boolean('isPrivate').notNullable().defaultTo(false)
+      table.boolean('isPublished').notNullable().defaultTo(false)
+      table.string('publishStartDate')
+      table.string('publishEndDate')
+      table.text('content')
+      table.string('contentType').notNullable()
+      table.string('createdAt').notNullable()
+
+      table.integer('pageId').unsigned().references('id').inTable('pages')
+      table.string('editorKey').references('key').inTable('editors')
+      table.string('localeCode', 2).references('code').inTable('locales')
+      table.integer('authorId').unsigned().references('id').inTable('users')
+    })
+    .raw('INSERT INTO pageHistory SELECT id,path,hash,title,description,isPrivate,isPublished,publishStartDate,publishEndDate,content,contentType,createdAt,NULL as pageId,editorKey,localeCode,authorId FROM pageHistory_old;')
+    .dropTable('pageHistory_old')
+}

server/db/migrations-sqlite/2.0.0-beta.38.js

+exports.up = knex => {
+  return knex.schema
+    .table('storage', table => {
+      table.string('syncInterval')
+      table.json('state')
+    })
+}
+
+exports.down = knex => {
+  return knex.schema
+    .table('storage', table => {
+      table.dropColumn('syncInterval')
+      table.dropColumn('state')
+    })
+}

server/db/migrator-source.js

@@ -2,6 +2,8 @@ const path = require('path')
 const fs = require('fs-extra')
 const semver = require('semver')
 
+const baseMigrationPath = path.join(WIKI.SERVERPATH, (WIKI.config.db.type !== 'sqlite') ? 'db/migrations' : 'db/migrations-sqlite')
+
 /* global WIKI */
 
 module.exports = {
@@ -10,11 +12,10 @@ module.exports = {
    * @returns Promise<string[]>
    */
   async getMigrations() {
-    const absoluteDir = path.join(WIKI.SERVERPATH, 'db/migrations')
-    const migrationFiles = await fs.readdir(absoluteDir)
+    const migrationFiles = await fs.readdir(baseMigrationPath)
     return migrationFiles.sort(semver.compare).map(m => ({
       file: m,
-      directory: absoluteDir
+      directory: baseMigrationPath
     }))
   },
 
@@ -23,6 +24,6 @@ module.exports = {
   },
 
   getMigration(migration) {
-    return require(path.join(WIKI.SERVERPATH, 'db/migrations', migration.file));
+    return require(path.join(baseMigrationPath, migration.file));
   }
 }

server/models/pages.js

@@ -174,6 +174,7 @@ module.exports = class Page extends Model {
     }
     await WIKI.models.pageHistory.addVersion({
       ...ogPage,
+      isPublished: ogPage.isPublished === true || ogPage.isPublished === 1,
       action: 'updated'
     })
     await WIKI.models.pages.query().patch({

server/modules/authentication/local/authentication.js

@@ -12,13 +12,14 @@ module.exports = {
       new LocalStrategy({
         usernameField: 'email',
         passwordField: 'password'
-      }, (uEmail, uPassword, done) => {
-        WIKI.models.users.query().findOne({
+      }, async (uEmail, uPassword, done) => {
+        try {
+          const user = await WIKI.models.users.query().findOne({
             email: uEmail,
             providerKey: 'local'
-        }).then((user) => {
+          })
           if (user) {
-            return user.verifyPassword(uPassword).then(() => {
+            await user.verifyPassword(uPassword)
             if (!user.isActive) {
               done(new WIKI.Error.AuthAccountBanned(), null)
             } else if (!user.isVerified) {
@@ -26,16 +27,13 @@ module.exports = {
             } else {
               done(null, user)
             }
-            }).catch((err) => {
-              done(err, null)
-            })
           } else {
             done(new WIKI.Error.AuthLoginFailed(), null)
           }
-        }).catch((err) => {
+        } catch (err) {
           done(err, null)
-        })
         }
-      ))
+      })
+    )
   }
 }

wiki.js

@@ -124,7 +124,9 @@ const init = {
     console.warn(chalk.yellow('--- Closing DB connections...'))
     await global.WIKI.models.knex.destroy()
     console.warn(chalk.yellow('--- Closing Server connections...'))
-    global.WIKI.server.destroy(() => {
+    if (global.WIKI.server) {
+      await new Promise((resolve, reject) => global.WIKI.server.destroy(resolve))
+    }
     console.warn(chalk.yellow('--- Purging node modules cache...'))
 
     global.WIKI = {}
@@ -145,7 +147,6 @@ const init = {
     process.removeAllListeners('uncaughtException')
 
     require('./server')
-    })
   }
 }