ghost 5.18.0 → 5.19.0

package/core/server/data/importer/importers/data/base.js

@@ -1,7 +1,7 @@
 const debug = require('@tryghost/debug')('importer:base');
 const _ = require('lodash');
 const Promise = require('bluebird');
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 const errors = require('@tryghost/errors');
 const {sequence} = require('@tryghost/promise');
 const models = require('../../../../models');

package/core/server/data/migrations/versions/4.0/05-add-members-subscribe-events-table.js

@@ -3,7 +3,7 @@ const {addTable} = require('../../utils');
 module.exports = addTable('members_subscribe_events', {
     id: {type: 'string', maxlength: 24, nullable: false, primary: true},
     member_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'members.id', cascadeDelete: true},
-    subscribed: {type: 'bool', nullable: false, defaultTo: true},
+    subscribed: {type: 'boolean', nullable: false, defaultTo: true},
     created_at: {type: 'dateTime', nullable: false},
     source: {type: 'string', maxlength: 50, nullable: true}
 });

package/core/server/data/migrations/versions/4.0/06-populate-members-subscribe-events-table.js

@@ -1,5 +1,5 @@
 const {chunk} = require('lodash');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {createTransactionalMigration} = require('../../utils');
 const logging = require('@tryghost/logging');
 

package/core/server/data/migrations/versions/4.0/11-add-members-paid-subscription-events-table.js

@@ -5,7 +5,7 @@ module.exports = addTable('members_paid_subscription_events', {
     member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
     from_plan: {type: 'string', maxlength: 255, nullable: true},
     to_plan: {type: 'string', maxlength: 255, nullable: true},
-    currency: {type: 'string', maxLength: 3, nullable: false},
+    currency: {type: 'string', maxlength: 191, nullable: false},
     source: {type: 'string', maxlength: 50, nullable: false},
     mrr_delta: {type: 'integer', nullable: false},
     created_at: {type: 'dateTime', nullable: false}

package/core/server/data/migrations/versions/4.0/13-add-members-payment-events-table.js

@@ -4,7 +4,7 @@ module.exports = addTable('members_payment_events', {
     id: {type: 'string', maxlength: 24, nullable: false, primary: true},
     member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
     amount: {type: 'integer', nullable: false},
-    currency: {type: 'string', maxLength: 3, nullable: false},
+    currency: {type: 'string', maxlength: 191, nullable: false},
     source: {type: 'string', maxlength: 50, nullable: false},
     created_at: {type: 'dateTime', nullable: false}
 });

package/core/server/data/migrations/versions/4.0/17-populate-members-status-events-table.js

@@ -1,5 +1,5 @@
 const {chunk} = require('lodash');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
 

package/core/server/data/migrations/versions/4.0/22-solve-orphaned-webhooks.js

@@ -1,6 +1,6 @@
 const {createIrreversibleMigration} = require('../../utils');
 const logging = require('@tryghost/logging');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const security = require('@tryghost/security');
 
 module.exports = createIrreversibleMigration(

package/core/server/data/migrations/versions/4.0/25-populate-members-paid-subscription-events-table.js

@@ -1,5 +1,5 @@
 const {chunk} = require('lodash');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {createTransactionalMigration} = require('../../utils');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');

package/core/server/data/migrations/versions/4.11/02-add-email-verification-required-setting.js

@@ -1,4 +1,4 @@
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
 

package/core/server/data/migrations/versions/4.12/01-add-email-only-column-to-posts-meta-table.js

@@ -1,7 +1,7 @@
 const {createAddColumnMigration} = require('../../utils');
 
 module.exports = createAddColumnMigration('posts_meta', 'email_only', {
-    type: 'bool',
+    type: 'boolean',
     nullable: false,
     defaultTo: false
 });

package/core/server/data/migrations/versions/4.3/03-add-default-product.js

@@ -1,5 +1,5 @@
 const {createTransactionalMigration} = require('../../utils');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {slugify} = require('@tryghost/string');
 const logging = require('@tryghost/logging');
 

package/core/server/data/migrations/versions/4.3/04-attach-members-to-product.js

@@ -1,5 +1,5 @@
 const {createTransactionalMigration} = require('../../utils');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {chunk} = require('lodash');
 const logging = require('@tryghost/logging');
 

package/core/server/data/migrations/versions/4.3/06-add-stripe-prices-table.js

@@ -4,9 +4,9 @@ module.exports = addTable('stripe_prices', {
     id: {type: 'string', maxlength: 24, nullable: false, primary: true},
     stripe_price_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
     stripe_product_id: {type: 'string', maxlength: 255, nullable: false, unique: false, references: 'stripe_products.stripe_product_id', cascadeDelete: true},
-    active: {type: 'bool', nullable: false},
+    active: {type: 'boolean', nullable: false},
     nickname: {type: 'string', maxlength: 50, nullable: true},
-    currency: {type: 'string', maxLength: 3, nullable: false},
+    currency: {type: 'string', maxlength: 191, nullable: false},
     amount: {type: 'integer', nullable: false},
     type: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'recurring', validations: {isIn: [['recurring', 'one_time']]}},
     interval: {type: 'string', maxlength: 50, nullable: true},

package/core/server/data/migrations/versions/4.3/08-migrate-members-signup-setting.js

@@ -1,6 +1,6 @@
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 
 module.exports = createTransactionalMigration(
     async function up(connection) {

package/core/server/data/migrations/versions/4.33/2022-01-14-11-51-add-default-free-tier.js

@@ -1,5 +1,5 @@
 const {createTransactionalMigration} = require('../../utils');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {slugify} = require('@tryghost/string');
 const logging = require('@tryghost/logging');
 

package/core/server/data/migrations/versions/4.42/2022-03-21-17-17-add.js

@@ -12,7 +12,7 @@ module.exports = addTable('newsletters', {
     sender_name: {type: 'string', maxlength: 191, nullable: false},
     sender_email: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
     sender_reply_to: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
-    default: {type: 'bool', nullable: false, defaultTo: false},
+    default: {type: 'boolean', nullable: false, defaultTo: false},
     status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'active'},
     recipient_filter: {
         type: 'text',
@@ -20,6 +20,6 @@ module.exports = addTable('newsletters', {
         nullable: false,
         defaultTo: ''
     },
-    subscribe_on_signup: {type: 'bool', nullable: false, defaultTo: false},
+    subscribe_on_signup: {type: 'boolean', nullable: false, defaultTo: false},
     sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
 });

package/core/server/data/migrations/versions/4.43/2022-03-28-19-26-recreate-newsletter-table.js

@@ -15,15 +15,15 @@ module.exports = recreateTable('newsletters', {
         nullable: false,
         defaultTo: 'members'
     },
-    subscribe_on_signup: {type: 'bool', nullable: false, defaultTo: true},
+    subscribe_on_signup: {type: 'boolean', nullable: false, defaultTo: true},
     sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0},
     header_image: {type: 'string', maxlength: 2000, nullable: true},
-    show_header_icon: {type: 'bool', nullable: false, defaultTo: true},
-    show_header_title: {type: 'bool', nullable: false, defaultTo: true},
+    show_header_icon: {type: 'boolean', nullable: false, defaultTo: true},
+    show_header_title: {type: 'boolean', nullable: false, defaultTo: true},
     title_font_category: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'sans_serif', validations: {isIn: [['serif', 'sans_serif']]}},
     title_alignment: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'center', validations: {isIn: [['center', 'left']]}},
-    show_feature_image: {type: 'bool', nullable: false, defaultTo: true},
+    show_feature_image: {type: 'boolean', nullable: false, defaultTo: true},
     body_font_category: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'sans_serif', validations: {isIn: [['serif', 'sans_serif']]}},
     footer_content: {type: 'text', maxlength: 1000000000, nullable: true},
-    show_badge: {type: 'bool', nullable: false, defaultTo: true}
+    show_badge: {type: 'boolean', nullable: false, defaultTo: true}
 });

package/core/server/data/migrations/versions/4.46/2022-04-13-13-00-add-default-newsletter.js

@@ -1,4 +1,4 @@
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 const uuid = require('uuid');
 const logging = require('@tryghost/logging');
 const startsWith = require('lodash/startsWith');

package/core/server/data/migrations/versions/4.46/2022-04-20-08-39-map-subscribers-to-default-newsletter.js

@@ -1,5 +1,5 @@
 const logging = require('@tryghost/logging');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 
 const {createTransactionalMigration} = require('../../utils');
 

package/core/server/data/migrations/versions/4.7/03-add-labs-setting.js

@@ -1,4 +1,4 @@
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
 

package/core/server/data/migrations/versions/4.8/03-add-default-product-portal-products.js

@@ -1,4 +1,4 @@
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const {createTransactionalMigration} = require('../../utils');
 const logging = require('@tryghost/logging');
 

package/core/server/data/migrations/versions/4.8/04-migrate-show-newsletter-header-setting.js

@@ -1,6 +1,6 @@
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 
 // newsletter_show_header = false ->
 //   newsletter_show_header_title = false

package/core/server/data/migrations/versions/5.0/2022-05-06-13-22-add-frontend-integration.js

@@ -1,5 +1,5 @@
 const logging = require('@tryghost/logging');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const security = require('@tryghost/security');
 const {createTransactionalMigration} = require('../../utils');
 

package/core/server/data/migrations/versions/5.17/2022-09-29-12-39-add-track-clicks-column-to-emails.js

@@ -1,7 +1,7 @@
 const {createAddColumnMigration} = require('../../utils');
 
 module.exports = createAddColumnMigration('emails', 'track_clicks', {
-    type: 'bool', 
-    nullable: false, 
+    type: 'boolean',
+    nullable: false,
     defaultTo: false
 });

package/core/server/data/migrations/versions/5.19/2022-09-02-20-25-add-columns-to-products-table.js

@@ -0,0 +1,19 @@
+const {createAddColumnMigration, combineNonTransactionalMigrations} = require('../../utils');
+
+module.exports = combineNonTransactionalMigrations(
+    createAddColumnMigration('products', 'monthly_price', {
+        type: 'integer',
+        unsigned: true,
+        nullable: true
+    }),
+    createAddColumnMigration('products', 'yearly_price', {
+        type: 'integer',
+        unsigned: true,
+        nullable: true
+    }),
+    createAddColumnMigration('products', 'currency', {
+        type: 'string',
+        maxlength: 50,
+        nullable: true
+    })
+);

package/core/server/data/migrations/versions/5.19/2022-09-02-20-52-backfill-new-product-columns.js

@@ -0,0 +1,37 @@
+const logging = require('@tryghost/logging');
+
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        const rows = await knex('products as t') // eslint-disable-line no-restricted-syntax
+            .select(
+                't.id as id',
+                'mp.amount as monthly_price',
+                'yp.amount as yearly_price',
+                knex.raw('coalesce(yp.currency, mp.currency) as currency')
+            )
+            .leftJoin('stripe_prices AS mp', 't.monthly_price_id', 'mp.id')
+            .leftJoin('stripe_prices AS yp', 't.yearly_price_id', 'yp.id')
+            .where('t.type', 'paid');
+
+        if (!rows.length) {
+            logging.info('Did not find any active paid Tiers');
+            return;
+        } else {
+            logging.info(`Updating ${rows.length} Tiers with price and currency information`);
+        }
+
+        for (const row of rows) { // eslint-disable-line no-restricted-syntax
+            await knex('products').update(row).where('id', row.id);
+        }
+    },
+    async function down(knex) {
+        logging.info('Removing currency and price information for all tiers');
+        await knex('products').update({
+            currency: null,
+            monthly_price: null,
+            yearly_price: null
+        });
+    }
+);

package/core/server/data/migrations/versions/5.19/2022-10-10-06-58-add-subscriptions-table.js

@@ -0,0 +1,19 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('subscriptions', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    type: {type: 'string', maxlength: 50, nullable: false},
+    status: {type: 'string', maxlength: 50, nullable: false},
+    member_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'members.id', cascadeDelete: true},
+    tier_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'products.id'},
+    cadence: {type: 'string', maxlength: 50, nullable: true},
+    currency: {type: 'string', maxlength: 50, nullable: true},
+    amount: {type: 'integer', nullable: true},
+    payment_provider: {type: 'string', maxlength: 50, nullable: true},
+    payment_subscription_url: {type: 'string', maxlength: 2000, nullable: true},
+    payment_user_url: {type: 'string', maxlength: 2000, nullable: true},
+    offer_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'offers.id'},
+    expires_at: {type: 'dateTime', nullable: true},
+    created_at: {type: 'dateTime', nullable: false},
+    updated_at: {type: 'dateTime', nullable: true}
+});

package/core/server/data/migrations/versions/5.19/2022-10-10-10-05-add-members-feedback-table.js

@@ -0,0 +1,10 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('members_feedback', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    score: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0},
+    member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
+    post_id: {type: 'string', maxlength: 24, nullable: false, references: 'posts.id', cascadeDelete: true},
+    created_at: {type: 'dateTime', nullable: false},
+    updated_at: {type: 'dateTime', nullable: true}
+});

package/core/server/data/migrations/versions/5.19/2022-10-11-10-38-add-feedback-enabled-column-to-newsletters.js

@@ -0,0 +1,7 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('newsletters', 'feedback_enabled', {
+    type: 'boolean',
+    nullable: false,
+    defaultTo: false
+});

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

@@ -126,7 +126,7 @@ async function dropColumn(tableName, column, transaction = db.knex, columnSpec =
  * Adds an unique index to a table over the given columns.
  *
  * @param {string} tableName - name of the table to add unique constraint to
- * @param {string|[string]} columns - column(s) to form unique constraint with
+ * @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 = db.knex) {
@@ -153,7 +153,7 @@ async function addUnique(tableName, columns, transaction = db.knex) {
  * Drops a unique key constraint from a table.
  *
  * @param {string} tableName - name of the table to drop unique constraint from
- * @param {string|[string]} columns - column(s) unique constraint was formed
+ * @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 = db.knex) {
@@ -327,7 +327,7 @@ async function hasPrimaryKeySQLite(tableName, transaction = db.knex) {
  * Adds an primary key index to a table over the given columns.
  *
  * @param {string} tableName - name of the table to add primaykey  constraint to
- * @param {string|[string]} columns - column(s) to form primary key constraint with
+ * @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 = db.knex) {

package/core/server/data/schema/fixtures/fixtures.json

@@ -15,7 +15,10 @@
                     "slug":             "default-product",
                     "type":             "paid",
                     "active":           true,
-                    "visibility":       "public"
+                    "visibility":       "public",
+                    "currency":         "usd",
+                    "monthly_price":    500,
+                    "yearly_price":     5000
                 }
             ]
         },

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

@@ -13,6 +13,7 @@ module.exports = {
         uuid: {type: 'string', maxlength: 36, nullable: false, unique: true, validations: {isUUID: true}},
         name: {type: 'string', maxlength: 191, nullable: false, unique: true},
         description: {type: 'string', maxlength: 2000, nullable: true},
+        feedback_enabled: {type: 'boolean', nullable: false, defaultTo: false},
         slug: {type: 'string', maxlength: 191, nullable: false, unique: true},
         sender_name: {type: 'string', maxlength: 191, nullable: true},
         sender_email: {type: 'string', maxlength: 191, nullable: true},
@@ -24,18 +25,18 @@ module.exports = {
             nullable: false,
             defaultTo: 'members'
         },
-        subscribe_on_signup: {type: 'bool', nullable: false, defaultTo: true},
+        subscribe_on_signup: {type: 'boolean', nullable: false, defaultTo: true},
         sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0},
         header_image: {type: 'string', maxlength: 2000, nullable: true},
-        show_header_icon: {type: 'bool', nullable: false, defaultTo: true},
-        show_header_title: {type: 'bool', nullable: false, defaultTo: true},
+        show_header_icon: {type: 'boolean', nullable: false, defaultTo: true},
+        show_header_title: {type: 'boolean', nullable: false, defaultTo: true},
         title_font_category: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'sans_serif', validations: {isIn: [['serif', 'sans_serif']]}},
         title_alignment: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'center', validations: {isIn: [['center', 'left']]}},
-        show_feature_image: {type: 'bool', nullable: false, defaultTo: true},
+        show_feature_image: {type: 'boolean', nullable: false, defaultTo: true},
         body_font_category: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'sans_serif', validations: {isIn: [['serif', 'sans_serif']]}},
         footer_content: {type: 'text', maxlength: 1000000000, nullable: true},
-        show_badge: {type: 'bool', nullable: false, defaultTo: true},
-        show_header_name: {type: 'bool', nullable: false, defaultTo: true},
+        show_badge: {type: 'boolean', nullable: false, defaultTo: true},
+        show_header_name: {type: 'boolean', nullable: false, defaultTo: true},
         created_at: {type: 'dateTime', nullable: false},
         updated_at: {type: 'dateTime', nullable: true}
     },
@@ -50,7 +51,7 @@ module.exports = {
         comment_id: {type: 'string', maxlength: 50, nullable: true},
         plaintext: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         feature_image: {type: 'string', maxlength: 2000, nullable: true},
-        featured: {type: 'bool', nullable: false, defaultTo: false},
+        featured: {type: 'boolean', nullable: false, defaultTo: false},
         type: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'post', validations: {isIn: [['post', 'page']]}},
         status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'draft', validations: {isIn: [['published', 'draft', 'scheduled', 'sent']]}},
         // NOTE: unused at the moment and reserved for future features
@@ -102,7 +103,7 @@ module.exports = {
         frontmatter: {type: 'text', maxlength: 65535, nullable: true},
         feature_image_alt: {type: 'string', maxlength: 191, nullable: true, validations: {isLength: {max: 125}}},
         feature_image_caption: {type: 'text', maxlength: 65535, nullable: true},
-        email_only: {type: 'bool', nullable: false, defaultTo: false}
+        email_only: {type: 'boolean', nullable: false, defaultTo: false}
     },
     // NOTE: this is the staff table
     users: {
@@ -423,7 +424,7 @@ module.exports = {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         name: {type: 'string', maxlength: 191, nullable: false},
         slug: {type: 'string', maxlength: 191, nullable: false, unique: true},
-        // @deprecated: use a status enum with isIn validation, not aan ctive boolean
+        // @deprecated: use a status enum with isIn validation, not an `active` boolean
         active: {type: 'boolean', nullable: false, defaultTo: true},
         welcome_page_url: {type: 'string', maxlength: 2000, nullable: true},
         visibility: {
@@ -434,16 +435,28 @@ module.exports = {
             validations: {isIn: [['public', 'none']]}
         },
         trial_days: {type: 'integer', unsigned: true, nullable: false, defaultTo: 0},
-        monthly_price_id: {type: 'string', maxlength: 24, nullable: true},
-        yearly_price_id: {type: 'string', maxlength: 24, nullable: true},
         description: {type: 'string', maxlength: 191, nullable: true},
-        type: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'paid', validations: {isIn: [['paid', 'free']]}},
+        type: {
+            type: 'string',
+            maxlength: 50,
+            nullable: false,
+            defaultTo: 'paid',
+            validations: {
+                isIn: [['paid', 'free']]
+            }
+        },
+        currency: {type: 'string', maxlength: 50, nullable: true},
+        monthly_price: {type: 'integer', unsigned: true, nullable: true},
+        yearly_price: {type: 'integer', unsigned: true, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        updated_at: {type: 'dateTime', nullable: true}
+        updated_at: {type: 'dateTime', nullable: true},
+        // To be removed in future
+        monthly_price_id: {type: 'string', maxlength: 24, nullable: true},
+        yearly_price_id: {type: 'string', maxlength: 24, nullable: true}
     },
     offers: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
-        // @deprecated: use a status enum with isIn validation, not aan ctive boolean
+        // @deprecated: use a status enum with isIn validation, not an `active` boolean
         active: {type: 'boolean', nullable: false, defaultTo: true},
         name: {type: 'string', maxlength: 191, nullable: false, unique: true},
         code: {type: 'string', maxlength: 191, nullable: false, unique: true},
@@ -516,7 +529,9 @@ module.exports = {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
         amount: {type: 'integer', nullable: false},
-        currency: {type: 'string', maxLength: 3, nullable: false},
+        // @note: this is longer than originally intended due to a bug - https://github.com/TryGhost/Ghost/pull/15606
+        // so we should decide whether we should reduce it down in the future
+        currency: {type: 'string', maxlength: 191, nullable: false},
         source: {type: 'string', maxlength: 50, nullable: false},
         created_at: {type: 'dateTime', nullable: false}
     },
@@ -565,7 +580,9 @@ module.exports = {
         subscription_id: {type: 'string', maxlength: 24, nullable: true},
         from_plan: {type: 'string', maxlength: 255, nullable: true},
         to_plan: {type: 'string', maxlength: 255, nullable: true},
-        currency: {type: 'string', maxLength: 3, nullable: false},
+        // @note: this is longer than originally intended due to a bug - https://github.com/TryGhost/Ghost/pull/15606
+        // so we should decide whether we should reduce it down in the future
+        currency: {type: 'string', maxlength: 191, nullable: false},
         source: {
             type: 'string', maxlength: 50, nullable: false, validations: {
                 isIn: [['stripe']]
@@ -600,13 +617,50 @@ module.exports = {
         updated_at: {type: 'dateTime', nullable: true},
         updated_by: {type: 'string', maxlength: 24, nullable: true}
     },
+    subscriptions: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        type: {
+            type: 'string', maxlength: 50, nullable: false, validations: {
+                isIn: [['free', 'comped', 'paid']]
+            }
+        },
+        status: {
+            type: 'string', maxlength: 50, nullable: false, validations: {
+                isIn: [['active', 'expired', 'canceled']]
+            }
+        },
+        member_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'members.id', cascadeDelete: true},
+        tier_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'products.id'},
+
+        // These are null if type !== 'paid'
+        cadence: {
+            type: 'string', maxlength: 50, nullable: true, validations: {
+                isIn: [['month', 'year']]
+            }
+        },
+        currency: {type: 'string', maxlength: 50, nullable: true},
+        amount: {type: 'integer', nullable: true},
+
+        // e.g. 'stripe'
+        payment_provider: {type: 'string', maxlength: 50, nullable: true},
+        // e.g. Stripe Subscription Link
+        payment_subscription_url: {type: 'string', maxlength: 2000, nullable: true},
+        // e.g. Stripe Customer Link
+        payment_user_url: {type: 'string', maxlength: 2000, nullable: true},
+
+        offer_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'offers.id'},
+
+        expires_at: {type: 'dateTime', nullable: true},
+        created_at: {type: 'dateTime', nullable: false},
+        updated_at: {type: 'dateTime', nullable: true}
+    },
     members_stripe_customers_subscriptions: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         customer_id: {type: 'string', maxlength: 255, nullable: false, unique: false, references: 'members_stripe_customers.customer_id', cascadeDelete: true},
         subscription_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
         stripe_price_id: {type: 'string', maxlength: 255, nullable: false, unique: false, index: true, defaultTo: ''},
         status: {type: 'string', maxlength: 50, nullable: false},
-        cancel_at_period_end: {type: 'bool', nullable: false, defaultTo: false},
+        cancel_at_period_end: {type: 'boolean', nullable: false, defaultTo: false},
         cancellation_reason: {type: 'string', maxlength: 500, nullable: true},
         current_period_end: {type: 'dateTime', nullable: false},
         start_date: {type: 'dateTime', nullable: false},
@@ -619,12 +673,14 @@ module.exports = {
         offer_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'offers.id'},
         trial_start_at: {type: 'dateTime', nullable: true},
         trial_end_at: {type: 'dateTime', nullable: true},
-        /* Below fields are now redundant as we link prie_id to stripe_prices table */
+        /* Below fields are now redundant as we link stripe_price_id to stripe_prices table */
         plan_id: {type: 'string', maxlength: 255, nullable: false, unique: false},
         plan_nickname: {type: 'string', maxlength: 50, nullable: false},
         plan_interval: {type: 'string', maxlength: 50, nullable: false},
         plan_amount: {type: 'integer', nullable: false},
-        plan_currency: {type: 'string', maxLength: 3, nullable: false}
+        // @note: this is longer than originally intended due to a bug - https://github.com/TryGhost/Ghost/pull/15606
+        // so we should decide whether we should reduce it down in the future
+        plan_currency: {type: 'string', maxlength: 191, nullable: false}
     },
     members_subscription_created_events: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -652,7 +708,7 @@ module.exports = {
     members_subscribe_events: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         member_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'members.id', cascadeDelete: true},
-        subscribed: {type: 'bool', nullable: false, defaultTo: true},
+        subscribed: {type: 'boolean', nullable: false, defaultTo: true},
         created_at: {type: 'dateTime', nullable: false},
         source: {
             type: 'string', maxlength: 50, nullable: true, validations: {
@@ -672,9 +728,11 @@ module.exports = {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         stripe_price_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
         stripe_product_id: {type: 'string', maxlength: 255, nullable: false, unique: false, references: 'stripe_products.stripe_product_id'},
-        active: {type: 'bool', nullable: false},
+        active: {type: 'boolean', nullable: false},
         nickname: {type: 'string', maxlength: 50, nullable: true},
-        currency: {type: 'string', maxLength: 3, nullable: false},
+        // @note: this is longer than originally intended due to a bug - https://github.com/TryGhost/Ghost/pull/15606
+        // so we should decide whether we should reduce it down in the future
+        currency: {type: 'string', maxlength: 191, nullable: false},
         amount: {type: 'integer', nullable: false},
         type: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'recurring', validations: {isIn: [['recurring', 'one_time']]}},
         interval: {type: 'string', maxlength: 50, nullable: true},
@@ -722,8 +780,8 @@ module.exports = {
         reply_to: {type: 'string', maxlength: 2000, nullable: true},
         html: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         plaintext: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
-        track_opens: {type: 'bool', nullable: false, defaultTo: false},
-        track_clicks: {type: 'bool', nullable: false, defaultTo: false},
+        track_opens: {type: 'boolean', nullable: false, defaultTo: false},
+        track_clicks: {type: 'boolean', nullable: false, defaultTo: false},
         submitted_at: {type: 'dateTime', nullable: false},
         newsletter_id: {type: 'string', maxlength: 24, nullable: true, references: 'newsletters.id'},
         created_at: {type: 'dateTime', nullable: false},
@@ -850,5 +908,13 @@ module.exports = {
         member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
         redirect_id: {type: 'string', maxlength: 24, nullable: false, references: 'redirects.id', cascadeDelete: true},
         created_at: {type: 'dateTime', nullable: false}
+    },
+    members_feedback: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        score: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0},
+        member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
+        post_id: {type: 'string', maxlength: 24, nullable: false, references: 'posts.id', cascadeDelete: true},
+        created_at: {type: 'dateTime', nullable: false},
+        updated_at: {type: 'dateTime', nullable: true}
     }
 };

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

@@ -63,7 +63,7 @@ function validateSchema(tableName, model, options) {
 
         // validate boolean columns
         if (Object.prototype.hasOwnProperty.call(schema[tableName][columnKey], 'type')
-            && schema[tableName][columnKey].type === 'bool') {
+            && schema[tableName][columnKey].type === 'boolean') {
             if (!(validator.isBoolean(strVal) || validator.isEmpty(strVal))) {
                 message = tpl(messages.valueMustBeBoolean, {
                     tableName: tableName,