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

cc-3936: Ran propgen to generate schema changes

Browse source
This commit is contained in:
Rudi Grinberg 2012-08-23 13:49:49 -04:00
parent e2d9f220f8
commit 996dcfd35f
5 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/models/StoredFile.php
View file

@ -466,6 +466,9 @@ class Application_Model_StoredFile
$storedFile->_file = $file; $storedFile->_file = $file;
// removed "//" in the path. Always use '/' for path separator // removed "//" in the path. Always use '/' for path separator
// TODO : it might be better to just call OsPath::normpath on the file
// path. Also note that mediamonitor normalizes the paths anyway
// before passing them to php so it's not necessary to do this at all
$filepath = str_replace("//", "/", $md['MDATA_KEY_FILEPATH']); $filepath = str_replace("//", "/", $md['MDATA_KEY_FILEPATH']);
$res = $storedFile->setFilePath($filepath); $res = $storedFile->setFilePath($filepath);
if ($res === -1) { if ($res === -1) {

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

@ -101,7 +101,7 @@ class CcFilesTableMap extends TableMap {
$this->addColumn('SOUNDCLOUD_LINK_TO_FILE', 'DbSoundcloudLinkToFile', 'VARCHAR', false, 4096, null); $this->addColumn('SOUNDCLOUD_LINK_TO_FILE', 'DbSoundcloudLinkToFile', 'VARCHAR', false, 4096, null);
$this->addColumn('SOUNDCLOUD_UPLOAD_TIME', 'DbSoundCloundUploadTime', 'TIMESTAMP', false, 6, null); $this->addColumn('SOUNDCLOUD_UPLOAD_TIME', 'DbSoundCloundUploadTime', 'TIMESTAMP', false, 6, null);
$this->addColumn('REPLAY_GAIN', 'DbReplayGain', 'VARCHAR', false, 16, null); $this->addColumn('REPLAY_GAIN', 'DbReplayGain', 'VARCHAR', false, 16, null);
$this->addForeignKey('OWNER_ID', 'ownerId', 'INTEGER', 'cc_subjs', 'ID', true, null, null); $this->addForeignKey('OWNER_ID', 'ownerId', 'INTEGER', 'cc_subjs', 'ID', false, null, null);
// validators // validators
} // initialize() } // initialize()

4
airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php
View file

@ -1964,7 +1964,7 @@ abstract class BaseCcFilesQuery extends ModelCriteria
* *
* @return CcFilesQuery The current query, for fluid interface * @return CcFilesQuery The current query, for fluid interface
*/ */
public function joinCcSubjsRelatedByownerId($relationAlias = '', $joinType = Criteria::INNER_JOIN) public function joinCcSubjsRelatedByownerId($relationAlias = '', $joinType = Criteria::LEFT_JOIN)
{ {
$tableMap = $this->getTableMap(); $tableMap = $this->getTableMap();
$relationMap = $tableMap->getRelation('CcSubjsRelatedByownerId'); $relationMap = $tableMap->getRelation('CcSubjsRelatedByownerId');
@ -1999,7 +1999,7 @@ abstract class BaseCcFilesQuery extends ModelCriteria
* *
* @return CcSubjsQuery A secondary query class using the current class as primary query * @return CcSubjsQuery A secondary query class using the current class as primary query
*/ */
public function useCcSubjsRelatedByownerIdQuery($relationAlias = '', $joinType = Criteria::INNER_JOIN) public function useCcSubjsRelatedByownerIdQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN)
{ {
return $this return $this
->joinCcSubjsRelatedByownerId($relationAlias, $joinType) ->joinCcSubjsRelatedByownerId($relationAlias, $joinType)

4
airtime_mvc/application/models/airtime/om/BaseCcSubjsQuery.php
View file

@ -543,7 +543,7 @@ abstract class BaseCcSubjsQuery extends ModelCriteria
* *
* @return CcSubjsQuery The current query, for fluid interface * @return CcSubjsQuery The current query, for fluid interface
*/ */
public function joinCcFilesRelatedByownerId($relationAlias = '', $joinType = Criteria::INNER_JOIN) public function joinCcFilesRelatedByownerId($relationAlias = '', $joinType = Criteria::LEFT_JOIN)
{ {
$tableMap = $this->getTableMap(); $tableMap = $this->getTableMap();
$relationMap = $tableMap->getRelation('CcFilesRelatedByownerId'); $relationMap = $tableMap->getRelation('CcFilesRelatedByownerId');
@ -578,7 +578,7 @@ abstract class BaseCcSubjsQuery extends ModelCriteria
* *
* @return CcFilesQuery A secondary query class using the current class as primary query * @return CcFilesQuery A secondary query class using the current class as primary query
*/ */
public function useCcFilesRelatedByownerIdQuery($relationAlias = '', $joinType = Criteria::INNER_JOIN) public function useCcFilesRelatedByownerIdQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN)
{ {
return $this return $this
->joinCcFilesRelatedByownerId($relationAlias, $joinType) ->joinCcFilesRelatedByownerId($relationAlias, $joinType)

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

@ -93,7 +93,7 @@ CREATE TABLE "cc_files"
"soundcloud_link_to_file" VARCHAR(4096), "soundcloud_link_to_file" VARCHAR(4096),
"soundcloud_upload_time" TIMESTAMP(6), "soundcloud_upload_time" TIMESTAMP(6),
"replay_gain" VARCHAR(16), "replay_gain" VARCHAR(16),
"owner_id" INTEGER NOT NULL, "owner_id" INTEGER,
PRIMARY KEY ("id") PRIMARY KEY ("id")
); );