From b8c2c5dfb1400ff59572e52839fee33cb125e5c4 Mon Sep 17 00:00:00 2001 From: james Date: Sun, 25 Sep 2011 17:18:26 -0400 Subject: [PATCH] CC-2867: separating Doctrine upgrade into 3 files - done --- .../Version20110829143306.php | 13 --------- .../Version20110922153933.php | 25 ++++------------ .../Version20110925171051.php | 26 +++++++++++++++++ .../Version20110925171256.php | 29 +++++++++++++++++++ .../airtime-2.0.0/airtime-upgrade.php | 2 +- 5 files changed, 61 insertions(+), 34 deletions(-) create mode 100644 install_minimal/DoctrineMigrations/Version20110925171051.php create mode 100644 install_minimal/DoctrineMigrations/Version20110925171256.php diff --git a/install_minimal/DoctrineMigrations/Version20110829143306.php b/install_minimal/DoctrineMigrations/Version20110829143306.php index 798312201..477df6a39 100644 --- a/install_minimal/DoctrineMigrations/Version20110829143306.php +++ b/install_minimal/DoctrineMigrations/Version20110829143306.php @@ -18,19 +18,6 @@ class Version20110829143306 extends AbstractMigration $cc_stream_setting->setPrimaryKey(array('keyname')); //end create cc_stream_setting table - - // add soundcloud_id, soundcloud_error_code, soundcloud_error_msg columns to cc_files - $cc_files = $schema->getTable('cc_files'); - $cc_files->addColumn('soundcloud_id', 'integer', array('notnull' => 0, 'default'=> NULL)); - $cc_files->addColumn('soundcloud_error_code', 'integer', array('notnull' => 0, 'default'=> NULL)); - $cc_files->addColumn('soundcloud_error_msg', 'string', array('length' => 255, 'notnull' => 0, 'default'=> NULL)); - } - - public function postUp(){ - // move soundcloud_id from cc_show_instances to cc_files - $this->_addSql("update cc_files as cf set soundcloud_id = csi.soundcloud_id - from cc_show_instances as csi - where csi.file_id = cf.id and file_id is not NULL"); } public function down(Schema $schema) diff --git a/install_minimal/DoctrineMigrations/Version20110922153933.php b/install_minimal/DoctrineMigrations/Version20110922153933.php index 591f67a22..42e10ad19 100644 --- a/install_minimal/DoctrineMigrations/Version20110922153933.php +++ b/install_minimal/DoctrineMigrations/Version20110922153933.php @@ -9,26 +9,11 @@ class Version20110922153933 extends AbstractMigration { public function up(Schema $schema) { - // move soundcloud_id from cc_show_instances to cc_files - $this->_addSql("update cc_files as cf set soundcloud_id = csi.soundcloud_id - from cc_show_instances as csi - where csi.file_id = cf.id and file_id is not NULL"); - - // remove soundcloud_id from cc_show_instance table - $cc_show_instances = $schema->getTable('cc_show_instances'); - $cc_show_instances->dropColumn('soundcloud_id'); - - // create cc_login_sttempts table - $cc_login = $schema->createTable('cc_login_attempts'); - - $cc_login->addColumn('ip', 'string', array('length' => 32)); - $cc_login->addColumn('attempts', 'integer', array('notnull' => 0, 'default'=> 0)); - - $cc_login->setPrimaryKey(array('ip')); - - // add login_attempts column to cc_subjs table - $cc_subjs = $schema->getTable('cc_subjs'); - $cc_subjs->addColumn('login_attempts', 'integer', array('notnull' => 0, 'default'=> 0)); + // add soundcloud_id, soundcloud_error_code, soundcloud_error_msg columns to cc_files + $cc_files = $schema->getTable('cc_files'); + $cc_files->addColumn('soundcloud_id', 'integer', array('notnull' => 0, 'default'=> NULL)); + $cc_files->addColumn('soundcloud_error_code', 'integer', array('notnull' => 0, 'default'=> NULL)); + $cc_files->addColumn('soundcloud_error_msg', 'string', array('length' => 255, 'notnull' => 0, 'default'=> NULL)); } public function down(Schema $schema) diff --git a/install_minimal/DoctrineMigrations/Version20110925171051.php b/install_minimal/DoctrineMigrations/Version20110925171051.php new file mode 100644 index 000000000..d4aa77cff --- /dev/null +++ b/install_minimal/DoctrineMigrations/Version20110925171051.php @@ -0,0 +1,26 @@ +_addSql("update cc_files as cf set soundcloud_id = csi.soundcloud_id + from cc_show_instances as csi + where csi.file_id = cf.id and file_id is not NULL"); + + // remove soundcloud_id from cc_show_instance table + $cc_show_instances = $schema->getTable('cc_show_instances'); + $cc_show_instances->dropColumn('soundcloud_id'); + } + + public function down(Schema $schema) + { + + } +} \ No newline at end of file diff --git a/install_minimal/DoctrineMigrations/Version20110925171256.php b/install_minimal/DoctrineMigrations/Version20110925171256.php new file mode 100644 index 000000000..b10c0a421 --- /dev/null +++ b/install_minimal/DoctrineMigrations/Version20110925171256.php @@ -0,0 +1,29 @@ +createTable('cc_login_attempts'); + + $cc_login->addColumn('ip', 'string', array('length' => 32)); + $cc_login->addColumn('attempts', 'integer', array('notnull' => 0, 'default'=> 0)); + + $cc_login->setPrimaryKey(array('ip')); + + // add login_attempts column to cc_subjs table + $cc_subjs = $schema->getTable('cc_subjs'); + $cc_subjs->addColumn('login_attempts', 'integer', array('notnull' => 0, 'default'=> 0)); + } + + public function down(Schema $schema) + { + + } +} \ No newline at end of file diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php index 83eb96d1c..a2cb64b09 100644 --- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php @@ -571,7 +571,7 @@ if(AirtimeInstall::DbTableExists('doctrine_migration_versions') === false) { } } -AirtimeInstall::MigrateTablesToVersion(__DIR__, '20110922153933'); +AirtimeInstall::MigrateTablesToVersion(__DIR__, '20110925171256'); AirtimeInstall::SetDefaultStreamSetting();