From 996dcfd35fd4a37acb7adbc9f3a5ceeeeccf6dbb Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Thu, 23 Aug 2012 13:49:49 -0400
Subject: [PATCH] cc-3936: Ran propgen to generate schema changes

---
 airtime_mvc/application/models/StoredFile.php                 | 3 +++
 .../application/models/airtime/map/CcFilesTableMap.php        | 2 +-
 .../application/models/airtime/om/BaseCcFilesQuery.php        | 4 ++--
 .../application/models/airtime/om/BaseCcSubjsQuery.php        | 4 ++--
 airtime_mvc/build/sql/schema.sql                              | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 5eb13631e..859649332 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -466,6 +466,9 @@ class Application_Model_StoredFile
         $storedFile->_file = $file;
 
         // 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']);
         $res = $storedFile->setFilePath($filepath);
         if ($res === -1) {
diff --git a/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php b/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php
index 602d55998..d7c258f19 100644
--- a/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php
+++ b/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php
@@ -101,7 +101,7 @@ class CcFilesTableMap extends TableMap {
 		$this->addColumn('SOUNDCLOUD_LINK_TO_FILE', 'DbSoundcloudLinkToFile', 'VARCHAR', false, 4096, null);
 		$this->addColumn('SOUNDCLOUD_UPLOAD_TIME', 'DbSoundCloundUploadTime', 'TIMESTAMP', false, 6, 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
 	} // initialize()
 
diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php
index 122e35707..188cce5a1 100644
--- a/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php
+++ b/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php
@@ -1964,7 +1964,7 @@ abstract class BaseCcFilesQuery extends ModelCriteria
 	 *
 	 * @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();
 		$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
 	 */
-	public function useCcSubjsRelatedByownerIdQuery($relationAlias = '', $joinType = Criteria::INNER_JOIN)
+	public function useCcSubjsRelatedByownerIdQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN)
 	{
 		return $this
 			->joinCcSubjsRelatedByownerId($relationAlias, $joinType)
diff --git a/airtime_mvc/application/models/airtime/om/BaseCcSubjsQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcSubjsQuery.php
index 778c1eeee..7487f7952 100644
--- a/airtime_mvc/application/models/airtime/om/BaseCcSubjsQuery.php
+++ b/airtime_mvc/application/models/airtime/om/BaseCcSubjsQuery.php
@@ -543,7 +543,7 @@ abstract class BaseCcSubjsQuery extends ModelCriteria
 	 *
 	 * @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();
 		$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
 	 */
-	public function useCcFilesRelatedByownerIdQuery($relationAlias = '', $joinType = Criteria::INNER_JOIN)
+	public function useCcFilesRelatedByownerIdQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN)
 	{
 		return $this
 			->joinCcFilesRelatedByownerId($relationAlias, $joinType)
diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql
index 3d55743ec..6a56b336e 100644
--- a/airtime_mvc/build/sql/schema.sql
+++ b/airtime_mvc/build/sql/schema.sql
@@ -93,7 +93,7 @@ CREATE TABLE "cc_files"
 	"soundcloud_link_to_file" VARCHAR(4096),
 	"soundcloud_upload_time" TIMESTAMP(6),
 	"replay_gain" VARCHAR(16),
-	"owner_id" INTEGER  NOT NULL,
+	"owner_id" INTEGER,
 	PRIMARY KEY ("id")
 );