From 8e3076190c9096343c953c18a9a423c3a91816c3 Mon Sep 17 00:00:00 2001 From: Robb Ebright Date: Fri, 31 Mar 2017 11:17:26 -0400 Subject: [PATCH] keep db changes in alpha.1 --- .../airtime_3.0.0-alpha.1/downgrade.sql | 2 ++ .../airtime_3.0.0-alpha.2/downgrade.sql | 1 - .../upgrade_sql/airtime_3.0.0-alpha.1/upgrade.sql | 1 + .../upgrade_sql/airtime_3.0.0-alpha.2/upgrade.sql | 1 - airtime_mvc/application/upgrade/Upgrades.php | 14 +------------- 5 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.2/downgrade.sql delete mode 100644 airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.2/upgrade.sql diff --git a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.1/downgrade.sql b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.1/downgrade.sql index fc4c019cd..1f7d24eb5 100644 --- a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.1/downgrade.sql +++ b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.1/downgrade.sql @@ -1,3 +1,5 @@ ALTER TABLE imported_podcast DROP COLUMN IF EXISTS album_override; ALTER TABLE third_party_track_references ALTER COLUMN file_id DROP DEFAULT; ALTER TABLE third_party_track_references ALTER COLUMN file_id SET NOT NULL; +ALTER TABLE cc_show DROP COLUMN IF EXISTS autoplaylist_repeat; + diff --git a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.2/downgrade.sql b/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.2/downgrade.sql deleted file mode 100644 index c018cd9d8..000000000 --- a/airtime_mvc/application/controllers/downgrade_sql/airtime_3.0.0-alpha.2/downgrade.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE cc_show DROP COLUMN IF EXISTS autoplaylist_repeat; diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.1/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.1/upgrade.sql index 786a3a033..76ffa03d7 100644 --- a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.1/upgrade.sql +++ b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.1/upgrade.sql @@ -1,3 +1,4 @@ ALTER TABLE imported_podcast ADD COLUMN album_override boolean default 'f' NOT NULL; ALTER TABLE third_party_track_references ALTER COLUMN file_id SET DEFAULT 0; ALTER TABLE third_party_track_references ALTER COLUMN file_id DROP NOT NULL; +ALTER TABLE cc_show ADD COLUMN autoplaylist_repeat boolean default 'f' NOT NULL; diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.2/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.2/upgrade.sql deleted file mode 100644 index 1a705ffc9..000000000 --- a/airtime_mvc/application/controllers/upgrade_sql/airtime_3.0.0-alpha.2/upgrade.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE cc_show ADD COLUMN autoplaylist_repeat boolean default 'f' NOT NULL; diff --git a/airtime_mvc/application/upgrade/Upgrades.php b/airtime_mvc/application/upgrade/Upgrades.php index 08e97bd73..5f2415ba2 100644 --- a/airtime_mvc/application/upgrade/Upgrades.php +++ b/airtime_mvc/application/upgrade/Upgrades.php @@ -518,16 +518,4 @@ class AirtimeUpgrader300alpha1 extends AirtimeUpgrader public function getNewVersion() { return '3.0.0-alpha.1'; } -} -class AirtimeUpgrader300alpha2 extends AirtimeUpgrader -{ - protected function getSupportedSchemaVersions() { - return array( - '3.0.0-alpha' - ); - } - - public function getNewVersion() { - return '3.0.0-alpha.2'; - } -} +} \ No newline at end of file