Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 

Conflicts:
	install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
This commit is contained in:
Martin Konecny 2011-11-03 14:51:55 -04:00
parent 6741adebef 6eff9d124e
commit 3d6c66a4d5
4 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/airtime/map/CcFilesTableMap.php
View File

@ -96,7 +96,7 @@ class CcFilesTableMap extends TableMap {
$this->addColumn('SOUNDCLOUD_ID', 'DbSoundcloudId', 'INTEGER', false, null, null);
$this->addColumn('SOUNDCLOUD_ERROR_CODE', 'DbSoundcloudErrorCode', 'INTEGER', false, null, null);
$this->addColumn('SOUNDCLOUD_ERROR_MSG', 'DbSoundcloudErrorMsg', 'VARCHAR', false, 512, null);
$this->addColumn('SOUNDCLOUD_LINK_TO_FILE', 'DbSoundcloudLinkToFile', 'VARCHAR', false, 512, null);
$this->addColumn('SOUNDCLOUD_LINK_TO_FILE', 'DbSoundcloudLinkToFile', 'VARCHAR', false, 4096, null);
// validators
} // initialize()

2
airtime_mvc/build/schema.xml
View File

@ -91,7 +91,7 @@
<column name="soundcloud_id" phpName="DbSoundcloudId" type="Integer" required="false"/>
<column name="soundcloud_error_code" phpName="DbSoundcloudErrorCode" type="Integer" required="false"/>
<column name="soundcloud_error_msg" phpName="DbSoundcloudErrorMsg" type="VARCHAR" size="512" required="false"/>
<column name="soundcloud_link_to_file" phpName="DbSoundcloudLinkToFile" type="VARCHAR" size="512" required="false"/>
<column name="soundcloud_link_to_file" phpName="DbSoundcloudLinkToFile" type="VARCHAR" size="4096" required="false"/>
<foreign-key foreignTable="cc_subjs" name="cc_files_editedby_fkey">
<reference local="editedby" foreign="id"/>
</foreign-key>

2
airtime_mvc/build/sql/schema.sql
View File

@ -117,7 +117,7 @@ CREATE TABLE "cc_files"
"soundcloud_id" INTEGER,
"soundcloud_error_code" INTEGER,
"soundcloud_error_msg" VARCHAR(512),
"soundcloud_link_to_file" VARCHAR(512),
"soundcloud_link_to_file" VARCHAR(4096),
PRIMARY KEY ("id"),
CONSTRAINT "cc_files_gunid_idx" UNIQUE ("gunid")
);

25
install_minimal/DoctrineMigrations/Version20111102142811.php Normal file
View File

@ -0,0 +1,25 @@
<?php
namespace DoctrineMigrations;
use Doctrine\DBAL\Migrations\AbstractMigration,
Doctrine\DBAL\Schema\Schema;
class Version20111102142811 extends AbstractMigration
{
public function up(Schema $schema)
{
// change 'soundcloud_upload' -> 'soundcloud_auto_upload_recorded_show' CC-2928
$this->_addSql("UPDATE cc_pref SET keystr = 'soundcloud_auto_upload_recorded_show'
WHERE keystr = 'soundcloud_upload'");
// add soundcloud_link_to_file
$cc_files = $schema->getTable('cc_files');
$cc_files->addColumn('soundcloud_link_to_file', 'string', array('length' => 4096, 'notnull' => 0, 'default'=> NULL));
}
public function down(Schema $schema)
{
}
}