ghost 4.36.3 → 4.38.1

package/core/server/data/migrations/versions/3.29/01-remove-duplicate-subscriptions.js

@@ -1,4 +1,5 @@
 const logging = require('@tryghost/logging');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = {
     config: {
@@ -6,7 +7,7 @@ module.exports = {
     },
 
     async up({transacting: knex}) {
-        if (knex.client.config.client !== 'mysql') {
+        if (!DatabaseInfo.isMySQL(knex)) {
             logging.warn('Skipping cleanup of duplicate subscriptions - database is not MySQL');
             return;
         }

package/core/server/data/migrations/versions/3.29/02-remove-duplicate-customers.js

@@ -1,4 +1,5 @@
 const logging = require('@tryghost/logging');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = {
     config: {
@@ -6,7 +7,7 @@ module.exports = {
     },
 
     async up({transacting: knex}) {
-        if (knex.client.config.client !== 'mysql') {
+        if (!DatabaseInfo.isMySQL(knex)) {
             logging.warn('Skipping cleanup of duplicate customers - database is not MySQL');
             return;
         }

package/core/server/data/migrations/versions/3.29/03-remove-orphaned-customers.js

@@ -1,4 +1,5 @@
 const logging = require('@tryghost/logging');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = {
     config: {
@@ -6,7 +7,7 @@ module.exports = {
     },
 
     async up({transacting: knex}) {
-        if (knex.client.config.client !== 'mysql') {
+        if (!DatabaseInfo.isMySQL(knex)) {
             logging.warn('Skipping cleanup of orphaned customers - database is not MySQL');
             return;
         }

package/core/server/data/migrations/versions/3.29/04-remove-orphaned-subscriptions.js

@@ -1,4 +1,5 @@
 const logging = require('@tryghost/logging');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = {
     config: {
@@ -6,7 +7,7 @@ module.exports = {
     },
 
     async up({transacting: knex}) {
-        if (knex.client.config.client !== 'mysql') {
+        if (!DatabaseInfo.isMySQL(knex)) {
             logging.warn('Skipping cleanup of orphaned subscriptions - database is not MySQL');
             return;
         }

package/core/server/data/migrations/versions/3.29/05-add-member-constraints.js

@@ -1,4 +1,5 @@
 const logging = require('@tryghost/logging');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = {
     config: {
@@ -6,7 +7,7 @@ module.exports = {
     },
 
     async up({transacting: knex}) {
-        if (knex.client.config.client !== 'mysql') {
+        if (!DatabaseInfo.isMySQL(knex)) {
             return logging.warn('Skipping member tables index creation - database is not MySQL');
         }
 
@@ -91,7 +92,7 @@ module.exports = {
     },
 
     async down({transacting: knex}) {
-        if (knex.client.config.client !== 'mysql') {
+        if (!DatabaseInfo.isMySQL(knex)) {
             return logging.warn('Skipping member tables index removal - database is not MySQL');
         }
 

package/core/server/data/migrations/versions/3.39/06-add-email-recipient-index.js

@@ -1,11 +1,12 @@
 const logging = require('@tryghost/logging');
 const {createNonTransactionalMigration} = require('../../utils');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = createNonTransactionalMigration(
     async function up(knex) {
         let hasIndex = false;
 
-        if (knex.client.config.client === 'sqlite3') {
+        if (DatabaseInfo.isSQLite(knex)) {
             const result = await knex.raw(`select * from sqlite_master where type = 'index' and tbl_name = 'email_recipients' and name = 'email_recipients_email_id_member_email_index'`);
             hasIndex = result.length !== 0;
         } else {
@@ -27,7 +28,7 @@ module.exports = createNonTransactionalMigration(
     async function down(knex) {
         let missingIndex = false;
 
-        if (knex.client.config.client === 'sqlite3') {
+        if (DatabaseInfo.isSQLite(knex)) {
             const result = await knex.raw(`select * from sqlite_master where type = 'index' and tbl_name = 'email_recipients' and name = 'email_recipients_email_id_member_email_index'`);
             missingIndex = result.length === 0;
         } else {
@@ -42,7 +43,7 @@ module.exports = createNonTransactionalMigration(
 
         logging.info('Dropping composite index on email_recipients for [email_id, member_email]');
 
-        if (knex.client.config.client === 'mysql') {
+        if (DatabaseInfo.isMySQL(knex)) {
             await knex.schema.table('email_recipients', (table) => {
                 table.dropForeign('email_id');
                 table.dropIndex(['email_id', 'member_email']);

package/core/server/data/migrations/versions/4.0/14-remove-orphaned-stripe-records.js

@@ -1,8 +1,9 @@
 const {createIrreversibleMigration} = require('../../utils');
 const logging = require('@tryghost/logging');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = createIrreversibleMigration(async function up(connection) {
-    if (connection.client.config.client === 'mysql') {
+    if (DatabaseInfo.isMySQL(connection)) {
         logging.info('Skipping removal of orphaned stripe records for MySQL');
         return;
     }

package/core/server/data/migrations/versions/4.0/26-add-cascade-on-delete.js

@@ -1,9 +1,10 @@
 const logging = require('@tryghost/logging');
 const {createIrreversibleMigration} = require('../../utils');
 const {addForeign, dropForeign} = require('../../../schema/commands');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = createIrreversibleMigration(async (knex) => {
-    if (knex.client.config.client !== 'sqlite3') {
+    if (!DatabaseInfo.isSQLite(knex)) {
         return logging.warn('Skipping adding "on delete cascade" - database is not SQLite3');
     }
 

package/core/server/data/migrations/versions/4.0/29-fix-foreign-key-for-members-stripe-customers-subscriptions.js

@@ -1,9 +1,10 @@
 const logging = require('@tryghost/logging');
 const {createIrreversibleMigration} = require('../../utils');
 const {addForeign, dropForeign} = require('../../../schema/commands');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = createIrreversibleMigration(async (knex) => {
-    if (knex.client.config.client !== 'sqlite3') {
+    if (!DatabaseInfo.isSQLite(knex)) {
         return logging.warn('Skipping fixing foreign key for members_stripe_customers_subscriptions - database is not SQLite3');
     }
 

package/core/server/data/migrations/versions/4.1/02-add-unique-constraint-for-member-stripe-tables.js

@@ -1,10 +1,11 @@
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
 const {addUnique} = require('../../../schema/commands');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = createTransactionalMigration(
     async function up(connection) {
-        if (connection.client.config.client !== 'sqlite3') {
+        if (!DatabaseInfo.isSQLite(connection)) {
             return logging.warn('Skipping adding unique constraint for members_stripe_customers_subscriptions and members_stripe_customers - database is not SQLite3');
         }
 

package/core/server/data/migrations/versions/4.20/05-remove-not-null-constraint-from-portal-title.js

@@ -1,6 +1,7 @@
 const logging = require('@tryghost/logging');
 const {createNonTransactionalMigration} = require('../../utils');
 const {addUnique} = require('../../../schema/commands');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = createNonTransactionalMigration(
     async function up(knex) {
@@ -14,7 +15,7 @@ module.exports = createNonTransactionalMigration(
             table.string('portal_title', 191).nullable();
         });
 
-        if (knex.client.config.client === 'sqlite3') {
+        if (DatabaseInfo.isSQLite(knex)) {
             // eslint-disable-next-line no-restricted-syntax
             for (const column of ['name', 'code', 'stripe_coupon_id']) {
                 await addUnique('offers', column, knex);
@@ -32,7 +33,7 @@ module.exports = createNonTransactionalMigration(
             table.string('portal_title', 191).notNullable();
         });
 
-        if (knex.client.config.client === 'sqlite3') {
+        if (DatabaseInfo.isSQLite(knex)) {
             // eslint-disable-next-line no-restricted-syntax
             for (const column of ['name', 'code', 'stripe_coupon_id']) {
                 await addUnique('offers', column, knex);

package/core/server/data/migrations/versions/4.33/2022-01-18-09-07-remove-duplicate-offer-redemptions.js

@@ -1,10 +1,10 @@
 const logging = require('@tryghost/logging');
-
 const {createTransactionalMigration} = require('../../utils');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = createTransactionalMigration(
     async function up(knex) {
-        if (knex.client.config.client !== 'mysql') {
+        if (!DatabaseInfo.isMySQL(knex)) {
             logging.warn('Skipping cleanup of duplicate offer redemptions - database is not MySQL');
             return;
         }

package/core/server/data/migrations/versions/4.35/2022-02-01-11-48-update-email-recipient-filter-column-type.js

@@ -1,9 +1,10 @@
 const logging = require('@tryghost/logging');
 const {createNonTransactionalMigration} = require('../../utils');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = createNonTransactionalMigration(
     async function up(knex) {
-        if (knex.client.config.client === 'sqlite3') {
+        if (DatabaseInfo.isSQLite(knex)) {
             logging.warn('Skipping migration for SQLite3');
             return;
         }

package/core/server/data/migrations/versions/4.35/2022-02-01-12-03-update-recipient-filter-column-type.js

@@ -1,9 +1,10 @@
 const logging = require('@tryghost/logging');
 const {createNonTransactionalMigration} = require('../../utils');
+const DatabaseInfo = require('@tryghost/database-info');
 
 module.exports = createNonTransactionalMigration(
     async function up(knex) {
-        if (knex.client.config.client === 'sqlite3') {
+        if (DatabaseInfo.isSQLite(knex)) {
             logging.warn('Skipping migration for SQLite3');
             return;
         }

package/core/server/data/migrations/versions/4.37/2022-02-21-09-53-backfill-members-last-seen-at-column.js

@@ -0,0 +1,32 @@
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration} = require('../../utils');
+const DatabaseInfo = require('@tryghost/database-info');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        if (DatabaseInfo.isSQLite(knex)) {
+            logging.warn('Skipping migration for SQLite3');
+            return;
+        }
+        logging.info('Backfilling the members.last_seen_at column from members_login_events.');
+        await knex.raw(`
+            UPDATE members
+                INNER JOIN (SELECT member_id as id, MAX(created_at) as last_seen_at
+                    FROM members_login_events
+                    GROUP BY member_id) as logins ON logins.id = members.id
+            SET
+                members.last_seen_at = logins.last_seen_at
+            WHERE
+                members.last_seen_at IS NULL
+                    OR members.last_seen_at < logins.last_seen_at
+        `);
+    },
+    async function down(knex) {
+        if (DatabaseInfo.isSQLite(knex)) {
+            logging.warn('Skipping migration for SQLite3');
+            return;
+        }
+        logging.info('Rolling back the backfilling of the members.last_seen_at column from members_login_events.');
+        await knex('members').update({last_seen_at: null});
+    }
+);

package/core/server/data/migrations/versions/4.38/2022-03-01-08-46-add-visibility-to-tiers.js

@@ -0,0 +1,11 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('products', 'visible', {
+    type: 'boolean',
+    nullable: false,
+    defaultTo: false
+});
+
+module.exports.up = async () => {
+    // noop - column will be replaced with `visibility` instead
+};

package/core/server/data/migrations/versions/4.38/2022-03-03-16-12-add-visibility-to-tiers.js

@@ -0,0 +1,8 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('products', 'visibility', {
+    type: 'string',
+    maxlength: 50,
+    nullable: false,
+    defaultTo: 'none'
+});

package/core/server/data/migrations/versions/4.38/2022-03-03-16-17-drop-tiers-visible-column.js

@@ -0,0 +1,7 @@
+const {createDropColumnMigration} = require('../../utils');
+
+module.exports = createDropColumnMigration('products', 'visible', {});
+
+module.exports.down = async () => {
+    // noop - column was replaced by `visibility` instead
+};

package/core/server/data/schema/clients/index.js

@@ -3,5 +3,5 @@ const mysql = require('./mysql');
 
 module.exports = {
     sqlite3: sqlite3,
-    mysql: mysql
+    mysql2: mysql
 };

package/core/server/data/schema/clients/mysql.js

@@ -1,8 +1,8 @@
 const _ = require('lodash');
 const db = require('../../../data/db');
 
-const doRawAndFlatten = function doRaw(query, transaction, flattenFn) {
-    return (transaction || db.knex).raw(query).then(function (response) {
+const doRawAndFlatten = function doRaw(query, transaction = db.knex, flattenFn) {
+    return transaction.raw(query).then(function (response) {
         return _.flatten(flattenFn(response));
     });
 };
@@ -31,8 +31,8 @@ const getColumns = function getColumns(table, transaction) {
 // a wrong datatype in schema.js some installations using mysql could have been created using the
 // data type text instead of mediumtext.
 // For details see: https://github.com/TryGhost/Ghost/issues/1947
-const checkPostTable = function checkPostTable(transaction) {
-    return (transaction || db.knex).raw('SHOW FIELDS FROM posts where Field ="html" OR Field = "markdown"').then(function (response) {
+const checkPostTable = function checkPostTable(transaction = db.knex) {
+    return transaction.raw('SHOW FIELDS FROM posts where Field ="html" OR Field = "markdown"').then(function (response) {
         return _.flatten(_.map(response[0], function (entry) {
             if (entry.Type.toLowerCase() !== 'mediumtext') {
                 return (transaction || db.knex).raw('ALTER TABLE posts MODIFY ' + entry.Field + ' MEDIUMTEXT');

package/core/server/data/schema/commands.js

@@ -4,6 +4,7 @@ const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const db = require('../db');
+const DatabaseInfo = require('@tryghost/database-info');
 const schema = require('./schema');
 const clients = require('./clients');
 
@@ -58,14 +59,14 @@ function addTableColumn(tableName, table, columnName, columnSpec = schema[tableN
     }
 }
 
-function addColumn(tableName, column, transaction, columnSpec) {
-    return (transaction || db.knex).schema.table(tableName, function (table) {
+function addColumn(tableName, column, transaction = db.knex, columnSpec) {
+    return transaction.schema.table(tableName, function (table) {
         addTableColumn(tableName, table, column, columnSpec);
     });
 }
 
-function dropColumn(tableName, column, transaction) {
-    return (transaction || db.knex).schema.table(tableName, function (table) {
+function dropColumn(tableName, column, transaction = db.knex) {
+    return transaction.schema.table(tableName, function (table) {
         table.dropColumn(column);
     });
 }
@@ -77,11 +78,11 @@ function dropColumn(tableName, column, transaction) {
  * @param {string|[string]} columns - column(s) to form unique constraint with
  * @param {import('knex')} transaction - connection object containing knex reference
  */
-async function addUnique(tableName, columns, transaction) {
+async function addUnique(tableName, columns, transaction = db.knex) {
     try {
         logging.info(`Adding unique constraint for: ${columns} in table ${tableName}`);
 
-        return await (transaction || db.knex).schema.table(tableName, function (table) {
+        return await transaction.schema.table(tableName, function (table) {
             table.unique(columns);
         });
     } catch (err) {
@@ -104,11 +105,11 @@ async function addUnique(tableName, columns, transaction) {
  * @param {string|[string]} columns - column(s) unique constraint was formed
  * @param {import('knex')} transaction - connection object containing knex reference
  */
-async function dropUnique(tableName, columns, transaction) {
+async function dropUnique(tableName, columns, transaction = db.knex) {
     try {
         logging.info(`Dropping unique constraint for: ${columns} in table: ${tableName}`);
 
-        return await (transaction || db.knex).schema.table(tableName, function (table) {
+        return await transaction.schema.table(tableName, function (table) {
             table.dropUnique(columns);
         });
     } catch (err) {
@@ -134,17 +135,14 @@ async function dropUnique(tableName, columns, transaction) {
  * @param {string} configuration.toColumn - column of the table to point the foreign key to
  * @param {import('knex')} configuration.transaction - connection object containing knex reference
  */
-async function hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, transaction}) {
-    const knex = (transaction || db.knex);
-    const client = knex.client.config.client;
-
-    if (client !== 'sqlite3') {
+async function hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, transaction = db.knex}) {
+    if (!DatabaseInfo.isSQLite(transaction)) {
         throw new errors.InternalServerError({
             message: tpl(messages.hasForeignSQLite3)
         });
     }
 
-    const foreignKeys = await knex.raw(`PRAGMA foreign_key_list('${fromTable}');`);
+    const foreignKeys = await transaction.raw(`PRAGMA foreign_key_list('${fromTable}');`);
 
     const hasForeignKey = foreignKeys.some(foreignKey => foreignKey.table === toTable && foreignKey.from === fromColumn && foreignKey.to === toColumn);
 
@@ -162,9 +160,8 @@ async function hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, trans
  * @param {Boolean} configuration.cascadeDelete - adds the "on delete cascade" option if true
  * @param {import('knex')} configuration.transaction - connection object containing knex reference
  */
-async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDelete = false, transaction}) {
-    const isSQLite = db.knex.client.config.client === 'sqlite3';
-    if (isSQLite) {
+async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDelete = false, transaction = db.knex}) {
+    if (DatabaseInfo.isSQLite(transaction)) {
         const foreignKeyExists = await hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, transaction});
         if (foreignKeyExists) {
             logging.warn(`Skipped adding foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - foreign key already exists`);
@@ -176,14 +173,14 @@ async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDele
 
         //disable and re-enable foreign key checks on sqlite because of https://github.com/knex/knex/issues/4155
         let foreignKeysEnabled;
-        if (isSQLite) {
+        if (DatabaseInfo.isSQLite(transaction)) {
             foreignKeysEnabled = await db.knex.raw('PRAGMA foreign_keys;');
             if (foreignKeysEnabled[0].foreign_keys) {
                 await db.knex.raw('PRAGMA foreign_keys = OFF;');
             }
         }
 
-        await (transaction || db.knex).schema.table(fromTable, function (table) {
+        await transaction.schema.table(fromTable, function (table) {
             if (cascadeDelete) {
                 table.foreign(fromColumn).references(`${toTable}.${toColumn}`).onDelete('CASCADE');
             } else {
@@ -191,13 +188,13 @@ async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDele
             }
         });
 
-        if (isSQLite) {
+        if (DatabaseInfo.isSQLite(transaction)) {
             if (foreignKeysEnabled[0].foreign_keys) {
                 await db.knex.raw('PRAGMA foreign_keys = ON;');
             }
         }
     } catch (err) {
-        if (err.code === 'ER_DUP_KEY') {
+        if (err.code === 'ER_DUP_KEY' || err.code === 'ER_FK_DUP_KEY' || err.code === 'ER_FK_DUP_NAME') {
             logging.warn(`Skipped adding foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - foreign key already exists`);
             return;
         }
@@ -215,9 +212,8 @@ async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDele
  * @param {string} configuration.toColumn - column of the table to point the foreign key to
  * @param {import('knex')} configuration.transaction - connection object containing knex reference
  */
-async function dropForeign({fromTable, fromColumn, toTable, toColumn, transaction}) {
-    const isSQLite = db.knex.client.config.client === 'sqlite3';
-    if (isSQLite) {
+async function dropForeign({fromTable, fromColumn, toTable, toColumn, transaction = db.knex}) {
+    if (DatabaseInfo.isSQLite(transaction)) {
         const foreignKeyExists = await hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, transaction});
         if (!foreignKeyExists) {
             logging.warn(`Skipped dropping foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - foreign key does not exist`);
@@ -229,18 +225,18 @@ async function dropForeign({fromTable, fromColumn, toTable, toColumn, transactio
 
         //disable and re-enable foreign key checks on sqlite because of https://github.com/knex/knex/issues/4155
         let foreignKeysEnabled;
-        if (isSQLite) {
+        if (DatabaseInfo.isSQLite(transaction)) {
             foreignKeysEnabled = await db.knex.raw('PRAGMA foreign_keys;');
             if (foreignKeysEnabled[0].foreign_keys) {
                 await db.knex.raw('PRAGMA foreign_keys = OFF;');
             }
         }
 
-        await (transaction || db.knex).schema.table(fromTable, function (table) {
+        await transaction.schema.table(fromTable, function (table) {
             table.dropForeign(fromColumn);
         });
 
-        if (isSQLite) {
+        if (DatabaseInfo.isSQLite(transaction)) {
             if (foreignKeysEnabled[0].foreign_keys) {
                 await db.knex.raw('PRAGMA foreign_keys = ON;');
             }
@@ -260,17 +256,14 @@ async function dropForeign({fromTable, fromColumn, toTable, toColumn, transactio
  * @param {string} tableName - name of the table to check primary key constraint on
  * @param {import('knex')} transaction - connection object containing knex reference
  */
-async function hasPrimaryKeySQLite(tableName, transaction) {
-    const knex = (transaction || db.knex);
-    const client = knex.client.config.client;
-
-    if (client !== 'sqlite3') {
+async function hasPrimaryKeySQLite(tableName, transaction = db.knex) {
+    if (!DatabaseInfo.isSQLite(transaction)){
         throw new errors.InternalServerError({
             message: tpl(messages.hasPrimaryKeySQLiteError)
         });
     }
 
-    const rawConstraints = await knex.raw(`PRAGMA index_list('${tableName}');`);
+    const rawConstraints = await transaction.raw(`PRAGMA index_list('${tableName}');`);
     const tablePrimaryKey = rawConstraints.find(c => c.origin === 'pk');
 
     return tablePrimaryKey;
@@ -283,9 +276,8 @@ async function hasPrimaryKeySQLite(tableName, transaction) {
  * @param {string|[string]} columns - column(s) to form primary key constraint with
  * @param {import('knex')} transaction - connection object containing knex reference
  */
-async function addPrimaryKey(tableName, columns, transaction) {
-    const isSQLite = db.knex.client.config.client === 'sqlite3';
-    if (isSQLite) {
+async function addPrimaryKey(tableName, columns, transaction = db.knex) {
+    if (DatabaseInfo.isSQLite(transaction)) {
         const primaryKeyExists = await hasPrimaryKeySQLite(tableName, transaction);
         if (primaryKeyExists) {
             logging.warn(`Primary key constraint for: ${columns} already exists for table: ${tableName}`);
@@ -294,7 +286,7 @@ async function addPrimaryKey(tableName, columns, transaction) {
     }
     try {
         logging.info(`Adding primary key constraint for: ${columns} in table ${tableName}`);
-        return await (transaction || db.knex).schema.table(tableName, function (table) {
+        return await transaction.schema.table(tableName, function (table) {
             table.primary(columns);
         });
     } catch (err) {
@@ -307,37 +299,36 @@ async function addPrimaryKey(tableName, columns, transaction) {
 }
 
 /**
- * https://github.com/tgriesser/knex/issues/1303
- * createTableIfNotExists can throw error if indexes are already in place
+ * Adds a table according to the provided spec, or falls back to the current schema
+ *
+ * NOTE: this function does NOT check if the table already exists - use the migration
+ * utils if you want that
+ *
+ * @param {String} table - name of the table to create
+ * @param {import('knex').Transaction} transaction - connection to the DB
+ * @param {Object} [tableSpec] - table schema to generate table with
  */
-function createTable(table, transaction, tableSpec = schema[table]) {
-    return (transaction || db.knex).schema.hasTable(table)
-        .then(function (exists) {
-            if (exists) {
-                return;
-            }
-
-            return (transaction || db.knex).schema.createTable(table, function (t) {
-                Object.keys(tableSpec)
-                    .filter(column => !(column.startsWith('@@')))
-                    .forEach(column => addTableColumn(table, t, column, tableSpec[column]));
-
-                if (tableSpec['@@INDEXES@@']) {
-                    tableSpec['@@INDEXES@@'].forEach(index => t.index(index));
-                }
-                if (tableSpec['@@UNIQUE_CONSTRAINTS@@']) {
-                    tableSpec['@@UNIQUE_CONSTRAINTS@@'].forEach(unique => t.unique(unique));
-                }
-            });
-        });
+function createTable(table, transaction = db.knex, tableSpec = schema[table]) {
+    return transaction.schema.createTable(table, function (t) {
+        Object.keys(tableSpec)
+            .filter(column => !(column.startsWith('@@')))
+            .forEach(column => addTableColumn(table, t, column, tableSpec[column]));
+
+        if (tableSpec['@@INDEXES@@']) {
+            tableSpec['@@INDEXES@@'].forEach(index => t.index(index));
+        }
+        if (tableSpec['@@UNIQUE_CONSTRAINTS@@']) {
+            tableSpec['@@UNIQUE_CONSTRAINTS@@'].forEach(unique => t.unique(unique));
+        }
+    });
 }
 
-function deleteTable(table, transaction) {
-    return (transaction || db.knex).schema.dropTableIfExists(table);
+function deleteTable(table, transaction = db.knex) {
+    return transaction.schema.dropTableIfExists(table);
 }
 
-function getTables(transaction) {
-    const client = (transaction || db.knex).client.config.client;
+function getTables(transaction = db.knex) {
+    const client = transaction.client.config.client;
 
     if (_.includes(_.keys(clients), client)) {
         return clients[client].getTables(transaction);
@@ -346,8 +337,8 @@ function getTables(transaction) {
     return Promise.reject(tpl(messages.noSupportForDatabase, {client: client}));
 }
 
-function getIndexes(table, transaction) {
-    const client = (transaction || db.knex).client.config.client;
+function getIndexes(table, transaction = db.knex) {
+    const client = transaction.client.config.client;
 
     if (_.includes(_.keys(clients), client)) {
         return clients[client].getIndexes(table, transaction);
@@ -356,8 +347,8 @@ function getIndexes(table, transaction) {
     return Promise.reject(tpl(messages.noSupportForDatabase, {client: client}));
 }
 
-function getColumns(table, transaction) {
-    const client = (transaction || db.knex).client.config.client;
+function getColumns(table, transaction = db.knex) {
+    const client = transaction.client.config.client;
 
     if (_.includes(_.keys(clients), client)) {
         return clients[client].getColumns(table);
@@ -366,10 +357,10 @@ function getColumns(table, transaction) {
     return Promise.reject(tpl(messages.noSupportForDatabase, {client: client}));
 }
 
-function checkTables(transaction) {
-    const client = (transaction || db.knex).client.config.client;
+function checkTables(transaction = db.knex) {
+    const client = transaction.client.config.client;
 
-    if (client === 'mysql') {
+    if (DatabaseInfo.isMySQL(transaction)) {
         return clients[client].checkPostTable();
     }
 }

package/core/server/data/schema/default-settings/index.js

@@ -0,0 +1,6 @@
+const config = require('../../../../shared/config');
+
+const defaultSettingsPath = config.get('paths').defaultSettings;
+const defaultSettings = require(defaultSettingsPath);
+
+module.exports = defaultSettings;