From b132f2e6d0db6dca4add8f4836546c59fb372e18 Mon Sep 17 00:00:00 2001 From: Robbt Date: Wed, 27 Mar 2019 09:10:15 -0400 Subject: [PATCH 1/5] merged database schema changes to alpha.7 release --- .../downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql | 4 ++++ .../downgrade_sql/airtime_3.0.0-alpha.8/downgrade.sql | 2 -- .../downgrade_sql/airtime_3.0.0-alpha.9/downgrade.sql | 1 - .../controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql | 4 ++++ .../controllers/upgrade_sql/airtime_3.0.0-alpha.8/upgrade.sql | 2 -- .../controllers/upgrade_sql/airtime_3.0.0-alpha.9/upgrade.sql | 1 - 6 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.8/downgrade.sql delete mode 100644 airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9/downgrade.sql delete mode 100644 airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.8/upgrade.sql delete mode 100644 airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9/upgrade.sql diff --git a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql index 1f562169c..0f3ed4c24 100644 --- a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql +++ b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql @@ -1 +1,5 @@ ALTER TABLE cc_block ALTER COLUMN type SET DEFAULT 'static'; +ALTER TABLE podcast_episodes DROP COLUMN IF EXISTS episode_title; +ALTER TABLE podcast_episodes DROP COLUMN IF EXISTS episode_description; +ALTER TABLE cc_blockcriteria DROP COLUMN IF EXISTS criteriagroup; + diff --git a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.8/downgrade.sql b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.8/downgrade.sql deleted file mode 100644 index 9e5f23e31..000000000 --- a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.8/downgrade.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE podcast_episodes DROP COLUMN IF EXISTS episode_title; -ALTER TABLE podcast_episodes DROP COLUMN IF EXISTS episode_description; \ No newline at end of file diff --git a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9/downgrade.sql b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9/downgrade.sql deleted file mode 100644 index 593b8c821..000000000 --- a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.9/downgrade.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE cc_blockcriteria DROP COLUMN IF EXISTS criteriagroup; \ No newline at end of file diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql index 08b362d0e..5a644fbc8 100644 --- a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql +++ b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql @@ -1 +1,5 @@ ALTER TABLE cc_block ALTER COLUMN type SET DEFAULT 'dynamic'; +ALTER TABLE podcast_episodes ADD COLUMN episode_title VARCHAR(4096); +ALTER TABLE podcast_episodes ADD COLUMN episode_description VARCHAR(4096); +ALTER TABLE cc_blockcriteria ADD COLUMN criteriagroup integer; + diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.8/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.8/upgrade.sql deleted file mode 100644 index a578c537e..000000000 --- a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.8/upgrade.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE podcast_episodes ADD COLUMN episode_title VARCHAR(4096); -ALTER TABLE podcast_episodes ADD COLUMN episode_description VARCHAR(4096); \ No newline at end of file diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9/upgrade.sql deleted file mode 100644 index a274478bf..000000000 --- a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.9/upgrade.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE cc_blockcriteria ADD COLUMN criteriagroup integer; From 6f9ce404a8afca2409f44aabcfdf7f748c9c14b6 Mon Sep 17 00:00:00 2001 From: Robbt Date: Mon, 1 Apr 2019 11:12:15 -0400 Subject: [PATCH 2/5] Remove duplicate sql from existing lines and update Upgrades.php --- .../airtime_3.0.0-alpha.7/downgrade.sql | 4 -- .../airtime_3.0.0-alpha.7/upgrade.sql | 4 -- airtime_mvc/application/upgrade/Upgrades.php | 40 ++++++++++++++++++- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql index 0f3ed4c24..1f562169c 100644 --- a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql +++ b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7/downgrade.sql @@ -1,5 +1 @@ ALTER TABLE cc_block ALTER COLUMN type SET DEFAULT 'static'; -ALTER TABLE podcast_episodes DROP COLUMN IF EXISTS episode_title; -ALTER TABLE podcast_episodes DROP COLUMN IF EXISTS episode_description; -ALTER TABLE cc_blockcriteria DROP COLUMN IF EXISTS criteriagroup; - diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql index 5a644fbc8..08b362d0e 100644 --- a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql +++ b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7/upgrade.sql @@ -1,5 +1 @@ ALTER TABLE cc_block ALTER COLUMN type SET DEFAULT 'dynamic'; -ALTER TABLE podcast_episodes ADD COLUMN episode_title VARCHAR(4096); -ALTER TABLE podcast_episodes ADD COLUMN episode_description VARCHAR(4096); -ALTER TABLE cc_blockcriteria ADD COLUMN criteriagroup integer; - diff --git a/airtime_mvc/application/upgrade/Upgrades.php b/airtime_mvc/application/upgrade/Upgrades.php index b524431ae..3745e119b 100644 --- a/airtime_mvc/application/upgrade/Upgrades.php +++ b/airtime_mvc/application/upgrade/Upgrades.php @@ -532,6 +532,12 @@ class AirtimeUpgrader300alpha6 extends AirtimeUpgrader return '3.0.0-alpha.6'; } } +/** + * Class AirtimeUpgrader300alpha7 + * + * GH-#636 - https://github.com/LibreTime/libretime/pull/636 - Change dynamic smartblock to be default smartblock type + */ + class AirtimeUpgrader300alpha7 extends AirtimeUpgrader { @@ -540,9 +546,39 @@ class AirtimeUpgrader300alpha7 extends AirtimeUpgrader '3.0.0-alpha.6' ); } +/** + * Class AirtimeUpgrader300alpha7-1 + * + * GH-#659 - https://github.com/LibreTime/libretime/pull/659/ - Add description and title to podcast episodes database table + */ + + +class AirtimeUpgrader300alpha7-1 extends AirtimeUpgrader +{ + protected function getSupportedSchemaVersions() { + return array( + '3.0.0-alpha.7' + ); + } +/** + * Class AirtimeUpgrader300alpha7-2 + * + * GH-#704 - https://github.com/LibreTime/libretime/pull/704/ - Add criteria group to smartblock table to enable database to store separately + */ + + + +class AirtimeUpgrader300alpha7-2 extends AirtimeUpgrader +{ + protected function getSupportedSchemaVersions() { + return array( + '3.0.0-alpha.7.1' + ); + } + + public function getNewVersion() { - return '3.0.0-alpha.7'; + return '3.0.0-alpha.7.2'; } } - From 1f98353847ad1bea0b9a68a3ddc84b5d74a8d1ae Mon Sep 17 00:00:00 2001 From: Robbt Date: Mon, 1 Apr 2019 11:14:50 -0400 Subject: [PATCH 3/5] changed class name to one permitted by language --- airtime_mvc/application/upgrade/Upgrades.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/upgrade/Upgrades.php b/airtime_mvc/application/upgrade/Upgrades.php index 3745e119b..e4b834436 100644 --- a/airtime_mvc/application/upgrade/Upgrades.php +++ b/airtime_mvc/application/upgrade/Upgrades.php @@ -553,7 +553,7 @@ class AirtimeUpgrader300alpha7 extends AirtimeUpgrader */ -class AirtimeUpgrader300alpha7-1 extends AirtimeUpgrader +class AirtimeUpgrader300alpha7_1 extends AirtimeUpgrader { protected function getSupportedSchemaVersions() { return array( @@ -568,7 +568,7 @@ class AirtimeUpgrader300alpha7-1 extends AirtimeUpgrader -class AirtimeUpgrader300alpha7-2 extends AirtimeUpgrader +class AirtimeUpgrader300alpha7_2 extends AirtimeUpgrader { protected function getSupportedSchemaVersions() { return array( From eff4f62f55fe8579cceafb7b446287302e4eca88 Mon Sep 17 00:00:00 2001 From: Robbt Date: Mon, 1 Apr 2019 11:18:14 -0400 Subject: [PATCH 4/5] fixed syntax errors --- airtime_mvc/application/upgrade/Upgrades.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/upgrade/Upgrades.php b/airtime_mvc/application/upgrade/Upgrades.php index e4b834436..110584874 100644 --- a/airtime_mvc/application/upgrade/Upgrades.php +++ b/airtime_mvc/application/upgrade/Upgrades.php @@ -546,6 +546,11 @@ class AirtimeUpgrader300alpha7 extends AirtimeUpgrader '3.0.0-alpha.6' ); } + public function getNewVersion() { + return '3.0.0-alpha.7'; + } + +} /** * Class AirtimeUpgrader300alpha7-1 * @@ -560,6 +565,11 @@ class AirtimeUpgrader300alpha7_1 extends AirtimeUpgrader '3.0.0-alpha.7' ); } + public function getNewVersion() { + return '3.0.0-alpha.7.1'; + } + +} /** * Class AirtimeUpgrader300alpha7-2 * @@ -575,9 +585,6 @@ class AirtimeUpgrader300alpha7_2 extends AirtimeUpgrader '3.0.0-alpha.7.1' ); } - - - public function getNewVersion() { return '3.0.0-alpha.7.2'; } From 88069432f978755c4c41b8538b895fc49b4cd452 Mon Sep 17 00:00:00 2001 From: Robbt Date: Mon, 1 Apr 2019 20:55:38 -0400 Subject: [PATCH 5/5] added alpha.7.x files --- .../downgrade_sql/airtime_3.0.0-alpha.7.1/downgrade.sql | 3 +++ .../downgrade_sql/airtime_3.0.0-alpha.7.2/downgrade.sql | 1 + .../upgrade_sql/airtime_3.0.0-alpha.7.1/upgrade.sql | 3 +++ .../upgrade_sql/airtime_3.0.0-alpha.7.2/upgrade.sql | 1 + 4 files changed, 8 insertions(+) create mode 100644 airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.1/downgrade.sql create mode 100644 airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.2/downgrade.sql create mode 100644 airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.1/upgrade.sql create mode 100644 airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.2/upgrade.sql diff --git a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.1/downgrade.sql b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.1/downgrade.sql new file mode 100644 index 000000000..eec397f70 --- /dev/null +++ b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.1/downgrade.sql @@ -0,0 +1,3 @@ +ALTER TABLE podcast_episodes DROP COLUMN IF EXISTS episode_title; +ALTER TABLE podcast_episodes DROP COLUMN IF EXISTS episode_description; + diff --git a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.2/downgrade.sql b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.2/downgrade.sql new file mode 100644 index 000000000..915be5e56 --- /dev/null +++ b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.7.2/downgrade.sql @@ -0,0 +1 @@ +ALTER TABLE cc_blockcriteria DROP COLUMN IF EXISTS criteriagroup; diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.1/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.1/upgrade.sql new file mode 100644 index 000000000..2615a0f92 --- /dev/null +++ b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.1/upgrade.sql @@ -0,0 +1,3 @@ +ALTER TABLE podcast_episodes ADD COLUMN episode_title VARCHAR(4096); +ALTER TABLE podcast_episodes ADD COLUMN episode_description VARCHAR(4096); + diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.2/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.2/upgrade.sql new file mode 100644 index 000000000..a274478bf --- /dev/null +++ b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.7.2/upgrade.sql @@ -0,0 +1 @@ +ALTER TABLE cc_blockcriteria ADD COLUMN criteriagroup integer;