Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Renames db version setting value

Browse Source
This commit is contained in:
Vlad
2017-09-11 10:05:09 -04:00
parent 98482cebf9
commit b0343254c0
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Config/Activator.php
View File

@ -13,7 +13,7 @@ class Activator {
$populator = new Populator(); $populator = new Populator();
$populator->up(); $populator->up();
Setting::setValue('version', Env::$version); Setting::setValue('db_version', Env::$version);
} }
function deactivate() { function deactivate() {

2
lib/Config/Initializer.php
View File

@ -124,7 +124,7 @@ class Initializer {
function maybeDbUpdate() { function maybeDbUpdate() {
try { try {
$current_db_version = Setting::getValue('version'); $current_db_version = Setting::getValue('db_version');
} catch(\Exception $e) { } catch(\Exception $e) {
$current_db_version = null; $current_db_version = null;
} }

6
lib/Config/Populator.php
View File

@ -337,7 +337,7 @@ class Populator {
function convertExistingDataToUTF8() { function convertExistingDataToUTF8() {
global $wpdb; global $wpdb;
if(!version_compare(Setting::getValue('version', '3.0.0-beta.33'), '3.0.0-beta.32', '<=')) { if(!version_compare(Setting::getValue('db_version', '3.0.0-beta.33'), '3.0.0-beta.32', '<=')) {
// Data conversion should only be performed only once, when migrating from // Data conversion should only be performed only once, when migrating from
// older version // older version
return false; return false;
@ -402,7 +402,7 @@ class Populator {
global $wpdb; global $wpdb;
// perform once for versions below 3.0.0-beta.36.2.1 // perform once for versions below 3.0.0-beta.36.2.1
if(version_compare(Setting::getValue('version', '3.0.0-beta.36.2.3'), '3.0.0-beta.36.2.1', '>=')) { if(version_compare(Setting::getValue('db_version', '3.0.0-beta.36.2.3'), '3.0.0-beta.36.2.1', '>=')) {
return false; return false;
} }
@ -455,7 +455,7 @@ class Populator {
global $wpdb; global $wpdb;
// perform once for versions below 3.0.0-beta.36.2.1 // perform once for versions below 3.0.0-beta.36.2.1
if(version_compare(Setting::getValue('version', '3.0.0-beta.36.2.3'), '3.0.0-beta.36.2.1', '>=')) { if(version_compare(Setting::getValue('db_version', '3.0.0-beta.36.2.3'), '3.0.0-beta.36.2.1', '>=')) {
return false; return false;
} }

6
tests/unit/Config/PopulatorTest.php
View File

@ -12,7 +12,7 @@ class PopulatorTest extends \MailPoetTest {
// TODO: remove in final release // TODO: remove in final release
// run for versions <= 3.0.0-beta.36.2.0 // run for versions <= 3.0.0-beta.36.2.0
Setting::setValue('version', '3.0.0-beta.36.2.0'); Setting::setValue('db_version', '3.0.0-beta.36.2.0');
$newsletters = array(); $newsletters = array();
for($i = 1; $i <= 3; $i++) { for($i = 1; $i <= 3; $i++) {
$newsletters[$i] = Newsletter::create(); $newsletters[$i] = Newsletter::create();
@ -32,7 +32,7 @@ class PopulatorTest extends \MailPoetTest {
expect(Newsletter::whereNotNull('sent_at')->findMany())->count(1); expect(Newsletter::whereNotNull('sent_at')->findMany())->count(1);
// do not run for versions >= 3.0.0-beta.36.2.1 // do not run for versions >= 3.0.0-beta.36.2.1
Setting::setValue('version', '3.0.0-beta.36.2.1'); Setting::setValue('db_version', '3.0.0-beta.36.2.1');
$populator = new Populator(); $populator = new Populator();
expect($populator->populateNewsletterSentAtField())->false(); expect($populator->populateNewsletterSentAtField())->false();
} }
@ -40,6 +40,6 @@ class PopulatorTest extends \MailPoetTest {
function _after() { function _after() {
\ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); \ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
\ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); \ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
Setting::setValue('version', MAILPOET_VERSION); Setting::setValue('db_version', MAILPOET_VERSION);
} }
} }

2
tests/unit/Cron/CronHelperTest.php
View File

@ -8,7 +8,7 @@ use MailPoet\Models\Setting;
class CronHelperTest extends \MailPoetTest { class CronHelperTest extends \MailPoetTest {
function _before() { function _before() {
Setting::setValue('version', MAILPOET_VERSION); Setting::setValue('db_version', MAILPOET_VERSION);
} }
function testItDefinesConstants() { function testItDefinesConstants() {