Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Add mobiledoc column to posts

Browse source 
refs #6301, #6255

- new, extra-long, column for storing mobiledoc content format
This commit is contained in:
Hannah Wolfe 2016-03-26 14:07:59 +00:00
parent e7cc18d5fb
commit 2685970d96
4 changed files with 100 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/server/data/migration/005/03-add-mobiledoc-column-to-posts.js Normal file
View file

@ -0,0 +1,24 @@
var commands = require('../../schema').commands,
db = require('../../db'),
table = 'posts',
column = 'mobiledoc',
message = 'Adding column: ' + table + '.' + column;
module.exports = function addMobiledocColumnToPosts(logger) {
return db.knex.schema.hasTable(table).then(function (exists) {
if (exists) {
return db.knex.schema.hasColumn(table, column).then(function (exists) {
if (!exists) {
logger.info(message);
return commands.addColumn(table, column);
} else {
logger.warn(message);
}
});
} else {
// @TODO: this should probably be an error
logger.warn(message);
}
});
};

4
core/server/data/migration/005/index.js
View file

@ -2,5 +2,7 @@ module.exports = [
// Drop hidden column from tags table
require('./01-drop-hidden-column-from-tags'),
// Add visibility column to posts, tags, and users tables
require('./02-add-visibility-column-to-key-tables')
require('./02-add-visibility-column-to-key-tables'),
// Add mobiledoc column to posts
require('./03-add-mobiledoc-column-to-posts')
];

1
core/server/data/schema/schema.js
View file

@ -5,6 +5,7 @@ module.exports = {
title: {type: 'string', maxlength: 150, nullable: false},
slug: {type: 'string', maxlength: 150, nullable: false, unique: true},
markdown: {type: 'text', maxlength: 16777215, fieldtype: 'medium', nullable: true},
mobiledoc: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
html: {type: 'text', maxlength: 16777215, fieldtype: 'medium', nullable: true},
image: {type: 'text', maxlength: 2000, nullable: true},
featured: {type: 'bool', nullable: false, defaultTo: false, validations: {isIn: [[0, 1, false, true]]}},

76
core/test/unit/migration_spec.js
View file

@ -32,7 +32,7 @@ var should = require('should'),
describe('DB version integrity', function () {
// Only these variables should need updating
var currentDbVersion = '005',
currentSchemaHash = '2b823f290d2ffa02ad5a10e31b77dab4',
currentSchemaHash = '4ae166ee14946fd617fcbe51b40daa7a',
currentFixturesHash = '77ebb081539f9e0c49f487faf7fd929e';
// If this test is failing, then it is likely a change has been made that requires a DB version bump,
@ -798,7 +798,7 @@ describe('Migrations', function () {
tasksSpy.calledOnce.should.be.true();
tasksSpy.calledWith('005', loggerStub).should.be.true();
tasksSpy.firstCall.returnValue.should.be.an.Array().with.lengthOf(2);
tasksSpy.firstCall.returnValue.should.be.an.Array().with.lengthOf(3);
sequenceStub.calledTwice.should.be.true();
@ -807,9 +807,10 @@ describe('Migrations', function () {
sequenceStub.firstCall.args[0][0].should.be.a.Function().with.property('name', 'runVersionTasks');
sequenceStub.secondCall.calledWith(sinon.match.array, loggerStub).should.be.true();
sequenceStub.secondCall.args[0].should.be.an.Array().with.lengthOf(2);
sequenceStub.secondCall.args[0].should.be.an.Array().with.lengthOf(3);
sequenceStub.secondCall.args[0][0].should.be.a.Function().with.property('name', 'dropHiddenColumnFromTags');
sequenceStub.secondCall.args[0][1].should.be.a.Function().with.property('name', 'addVisibilityColumnToKeyTables');
sequenceStub.secondCall.args[0][2].should.be.a.Function().with.property('name', 'addMobiledocColumnToPosts');
// Reset sequence
sequenceReset();
@ -840,7 +841,7 @@ describe('Migrations', function () {
it('should have tasks for 005', function () {
should.exist(updates005);
updates005.should.be.an.Array().with.lengthOf(2);
updates005.should.be.an.Array().with.lengthOf(3);
});
describe('01-drop-hidden-column-from-tags', function () {
@ -1033,6 +1034,73 @@ describe('Migrations', function () {
}).catch(done);
});
});
describe('03-add-mobiledoc-column-to-posts', function () {
it('does not try to add a new column if the table does not exist', function (done) {
// Setup
knexMock.schema.hasTable.withArgs('posts').returns(Promise.resolve(false));
// Execute
updates005[2](loggerStub).then(function () {
knexMock.schema.hasTable.calledOnce.should.be.true();
knexMock.schema.hasTable.calledWith('posts').should.be.true();
knexMock.schema.hasColumn.called.should.be.false();
addColumnStub.called.should.be.false();
loggerStub.info.called.should.be.false();
loggerStub.warn.calledOnce.should.be.true();
done();
}).catch(done);
});
it('does not try to add a new column if the column already exists', function (done) {
// Setup
knexMock.schema.hasTable.withArgs('posts').returns(new Promise.resolve(true));
knexMock.schema.hasColumn.withArgs('posts', 'mobiledoc').returns(Promise.resolve(true));
// Execute
updates005[2](loggerStub).then(function () {
knexMock.schema.hasTable.calledOnce.should.be.true();
knexMock.schema.hasTable.calledWith('posts').should.be.true();
knexMock.schema.hasColumn.calledOnce.should.be.true();
knexMock.schema.hasColumn.calledWith('posts', 'mobiledoc').should.be.true();
addColumnStub.called.should.be.false();
loggerStub.info.called.should.be.false();
loggerStub.warn.calledOnce.should.be.true();
done();
}).catch(done);
});
it('tries to add a new column if table is present but column is not', function (done) {
// Setup
knexMock.schema.hasTable.withArgs('posts').returns(Promise.resolve(true));
knexMock.schema.hasColumn.withArgs('posts', 'mobiledoc').returns(Promise.resolve(false));
// Execute
updates005[2](loggerStub).then(function () {
knexMock.schema.hasTable.calledOnce.should.be.true();
knexMock.schema.hasTable.calledWith('posts').should.be.true();
knexMock.schema.hasColumn.calledOnce.should.be.true();
knexMock.schema.hasColumn.calledWith('posts', 'mobiledoc').should.be.true();
addColumnStub.calledOnce.should.be.true();
addColumnStub.calledWith('posts', 'mobiledoc').should.be.true();
loggerStub.info.calledOnce.should.be.true();
loggerStub.warn.called.should.be.false();
done();
}).catch(done);
});
});
});
});
});