diff --git a/install_minimal/DoctrineMigrations/Version20110829143306.php b/install_minimal/DoctrineMigrations/Version20110829143306.php index 477df6a39..798312201 100644 --- a/install_minimal/DoctrineMigrations/Version20110829143306.php +++ b/install_minimal/DoctrineMigrations/Version20110829143306.php @@ -18,6 +18,19 @@ 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 new file mode 100644 index 000000000..591f67a22 --- /dev/null +++ b/install_minimal/DoctrineMigrations/Version20110922153933.php @@ -0,0 +1,38 @@ +_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)); + } + + 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 5b6eb6006..83eb96d1c 100644 --- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php @@ -301,7 +301,7 @@ class ConvertToUtc{ $dt = new DateTime($sd->getDbFirstShow()." ".$sd->getDbStartTime(), new DateTimeZone(date_default_timezone_get())); $dt->setTimezone(new DateTimeZone("UTC")); $sd->setDbFirstShow($dt->format("Y-m-d")); - $sd->setDbStartTime($dt->format("H-i-s")); + $sd->setDbStartTime($dt->format("H:i:s")); $dt = new DateTime($sd->getDbLastShow()." ".$sd->getDbStartTime(), new DateTimeZone(date_default_timezone_get())); $dt->setTimezone(new DateTimeZone("UTC")); @@ -571,7 +571,7 @@ if(AirtimeInstall::DbTableExists('doctrine_migration_versions') === false) { } } -AirtimeInstall::MigrateTablesToVersion(__DIR__, '20110829143306'); +AirtimeInstall::MigrateTablesToVersion(__DIR__, '20110922153933'); AirtimeInstall::SetDefaultStreamSetting();