From d4d16b4bf4cf17bd7040b54692aa10b97a2e905e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Wed, 21 Aug 2019 15:26:57 +0200 Subject: [PATCH] Fix and simplify plugin version injection in dump for tests [MAILPOET-2209] --- tests/_support/CleanupExtension.php | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/tests/_support/CleanupExtension.php b/tests/_support/CleanupExtension.php index 8248537805..401238f0d4 100644 --- a/tests/_support/CleanupExtension.php +++ b/tests/_support/CleanupExtension.php @@ -5,7 +5,6 @@ use Codeception\Event\TestEvent; use Codeception\Events; use Codeception\Extension; use MailPoet\Config\Env; -use MailPoet\Premium\Config\Env as PremiumEnv; class CleanupExtension extends Extension { const DB_BACKUP_PATH = __DIR__ . '/../_data/acceptanceBackup.sql'; @@ -56,20 +55,10 @@ class CleanupExtension extends Extension { $version = Env::$version; $sql .= " \n\n - INSERT INTO mp_mailpoet_settings (name, value) VALUES ('db_version', '$version') - ON DUPLICATE KEY UPDATE SET value = '$version'; + INSERT INTO mp_mailpoet_settings (name, value) VALUES ('version', '$version') + ON DUPLICATE KEY UPDATE value = '$version'; "; - // set current plugin version for Premium - if (class_exists(PremiumEnv::class)) { - $premium_version = PremiumEnv::$version; - $sql .= " - \n\n - INSERT INTO mp_mailpoet_settings (name, value) VALUES ('premium_db_version', '$premium_version') - ON DUPLICATE KEY UPDATE SET value = '$premium_version' ; - "; - } - // wrap SQL with serializable transaction (to avoid other connections like WP-CLI seeing wrong state) $sql = " SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;