From 25721828d930915349551393d680980bfbaaf54c Mon Sep 17 00:00:00 2001 From: Nazar Gargol Date: Thu, 13 Feb 2020 12:53:44 +0800 Subject: [PATCH] Fixed failure when upgrading to version 3.5.x no issue - Initialy reported here: https://forum.ghost.org/t/unable-to-upgrade-ghost-from-v3-0-2-to-v3-5-1/11925 - The issue was caused by the refactor in 52635f1aa8ca4280f60a4161b078b592abe29a5c where the backup module signature changed and it wasn't updated in migrations --- core/server/data/migrations/hooks/migrate/before.js | 4 ++-- core/test/unit/data/db/backup_spec.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/server/data/migrations/hooks/migrate/before.js b/core/server/data/migrations/hooks/migrate/before.js index 138bdeef7a..403df18dc6 100644 --- a/core/server/data/migrations/hooks/migrate/before.js +++ b/core/server/data/migrations/hooks/migrate/before.js @@ -1,7 +1,7 @@ -var backup = require('../../../db/backup'), +var dbBackup = require('../../../db/backup'), models = require('../../../../models'); module.exports = function before() { models.init(); - return backup(); + return dbBackup.backup(); }; diff --git a/core/test/unit/data/db/backup_spec.js b/core/test/unit/data/db/backup_spec.js index 2c2fee7a51..7b2e54db75 100644 --- a/core/test/unit/data/db/backup_spec.js +++ b/core/test/unit/data/db/backup_spec.js @@ -4,7 +4,7 @@ var should = require('should'), fs = require('fs-extra'), models = require('../../../../server/models'), exporter = require('../../../../server/data/exporter'), - backupDatabase = require('../../../../server/data/db/backup'); + dbBackup = require('../../../../server/data/db/backup'); describe('Backup', function () { var exportStub, filenameStub, fsStub; @@ -24,7 +24,7 @@ describe('Backup', function () { }); it('should create a backup JSON file', function (done) { - backupDatabase.backup().then(function () { + dbBackup.backup().then(function () { exportStub.calledOnce.should.be.true(); filenameStub.calledOnce.should.be.true(); fsStub.calledOnce.should.be.true();