diff --git a/core/server/data/default-settings.json b/core/server/data/default-settings.json index ec6fe4d479..99ed0cd6fb 100644 --- a/core/server/data/default-settings.json +++ b/core/server/data/default-settings.json @@ -1,7 +1,7 @@ { "core": { "databaseVersion": { - "defaultValue": "003" + "defaultValue": "004" }, "dbHash": { "defaultValue": null diff --git a/core/server/data/schema.js b/core/server/data/schema.js index 68ee40dd17..c7b653e6e3 100644 --- a/core/server/data/schema.js +++ b/core/server/data/schema.js @@ -162,6 +162,11 @@ var db = { name: {type: 'string', maxlength: 150, nullable: false, unique: true}, slug: {type: 'string', maxlength: 150, nullable: false, unique: true}, secret: {type: 'string', maxlength: 150, nullable: false, unique: true}, + redirection_uri: {type: 'string', maxlength: 2000, nullable: true}, + logo: {type: 'string', maxlength: 2000, nullable: true}, + status: {type: 'string', maxlength: 150, nullable: false, defaultTo: 'development'}, + type: {type: 'string', maxlength: 150, nullable: false, defaultTo: 'Client-Side'}, + description: {type: 'string', maxlength: 200, nullable: true}, created_at: {type: 'dateTime', nullable: false}, created_by: {type: 'integer', nullable: false}, updated_at: {type: 'dateTime', nullable: true}, diff --git a/core/test/integration/export_spec.js b/core/test/integration/export_spec.js index d14fb5e9b7..0455d99318 100644 --- a/core/test/integration/export_spec.js +++ b/core/test/integration/export_spec.js @@ -24,7 +24,7 @@ describe('Exporter', function () { it('exports data', function (done) { // Stub migrations to return 000 as the current database version var versioningStub = sandbox.stub(versioning, 'getDatabaseVersion', function () { - return Promise.resolve('003'); + return Promise.resolve('004'); }); exporter().then(function (exportData) { @@ -37,13 +37,13 @@ describe('Exporter', function () { should.exist(exportData.meta); should.exist(exportData.data); - exportData.meta.version.should.equal('003'); + exportData.meta.version.should.equal('004'); dbVersionSetting = _.findWhere(exportData.data.settings, {key: 'databaseVersion'}); should.exist(dbVersionSetting); - dbVersionSetting.value.should.equal('003'); + dbVersionSetting.value.should.equal('004'); _.each(tables, function (name) { should.exist(exportData.data[name]); diff --git a/core/test/integration/import_spec.js b/core/test/integration/import_spec.js index 486e86d312..16208319f4 100644 --- a/core/test/integration/import_spec.js +++ b/core/test/integration/import_spec.js @@ -154,7 +154,7 @@ describe('Import', function () { // test settings settings.length.should.be.above(0, 'Wrong number of settings'); - _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('003', 'Wrong database version'); + _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('004', 'Wrong database version'); // test tags tags.length.should.equal(exportData.data.tags.length, 'no new tags'); @@ -210,7 +210,7 @@ describe('Import', function () { // test settings settings.length.should.be.above(0, 'Wrong number of settings'); - _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('003', 'Wrong database version'); + _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('004', 'Wrong database version'); // activeTheme should NOT have been overridden _.findWhere(settings, {key: 'activeTheme'}).value.should.equal('casper', 'Wrong theme'); @@ -271,7 +271,7 @@ describe('Import', function () { // test settings settings.length.should.be.above(0, 'Wrong number of settings'); - _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('003', 'Wrong database version'); + _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('004', 'Wrong database version'); done(); }); @@ -316,7 +316,7 @@ describe('Import', function () { // test settings settings.length.should.be.above(0, 'Wrong number of settings'); - _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('003', 'Wrong database version'); + _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('004', 'Wrong database version'); done(); }); @@ -374,7 +374,7 @@ describe('Import', function () { // test settings settings.length.should.be.above(0, 'Wrong number of settings'); - _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('003', 'Wrong database version'); + _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('004', 'Wrong database version'); // activeTheme should NOT have been overridden _.findWhere(settings, {key: 'activeTheme'}).value.should.equal('casper', 'Wrong theme'); @@ -434,7 +434,7 @@ describe('Import', function () { // test settings settings.length.should.be.above(0, 'Wrong number of settings'); - _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('003', 'Wrong database version'); + _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('004', 'Wrong database version'); done(); }); @@ -478,7 +478,7 @@ describe('Import', function () { // test settings settings.length.should.be.above(0, 'Wrong number of settings'); - _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('003', 'Wrong database version'); + _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('004', 'Wrong database version'); done(); }); @@ -528,7 +528,7 @@ describe('Import', function () { // test settings settings.length.should.be.above(0, 'Wrong number of settings'); - _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('003', 'Wrong database version'); + _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('004', 'Wrong database version'); done(); }).catch(done); @@ -718,7 +718,7 @@ describe('Import (new test structure)', function () { // test settings settings.length.should.be.above(0, 'Wrong number of settings'); - _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('003', 'Wrong database version'); + _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('004', 'Wrong database version'); done(); }).catch(done); @@ -943,7 +943,7 @@ describe('Import (new test structure)', function () { // test settings settings.length.should.be.above(0, 'Wrong number of settings'); - _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('003', 'Wrong database version'); + _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('004', 'Wrong database version'); done(); }).catch(done); @@ -1180,7 +1180,7 @@ describe('Import (new test structure)', function () { // test settings settings.length.should.be.above(0, 'Wrong number of settings'); - _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('003', 'Wrong database version'); + _.findWhere(settings, {key: 'databaseVersion'}).value.should.equal('004', 'Wrong database version'); done(); }).catch(done); diff --git a/core/test/unit/migration_spec.js b/core/test/unit/migration_spec.js index 56b0ec22c0..5b6b396e32 100644 --- a/core/test/unit/migration_spec.js +++ b/core/test/unit/migration_spec.js @@ -19,8 +19,8 @@ describe('Migrations', function () { describe('DB version integrity', function () { // Only these variables should need updating - var currentDbVersion = '003', - currentSchemaHash = '4f2a9e139f4c3dcf04e3006ea8ebba97', + var currentDbVersion = '004', + currentSchemaHash = 'a27a018a8aef272fd298b33552c2446b', currentPermissionsHash = '42e486732270cda623fc5efc04808c0c'; // If this test is failing, then it is likely a change has been made that requires a DB version bump,