From 3198d822bfd5b9e48f427e41eeacbac5c6f6ba57 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 21 Sep 2015 14:51:32 -0400
Subject: [PATCH] SAAS-1058: Podcast table schema

Remove not null constraint on podcast_episodes file_id column
---
 .../models/airtime/map/PodcastEpisodesTableMap.php            | 2 +-
 airtime_mvc/application/models/airtime/om/BaseCcFiles.php     | 2 +-
 .../application/models/airtime/om/BaseCcFilesQuery.php        | 4 ++--
 .../models/airtime/om/BasePodcastEpisodesQuery.php            | 4 ++--
 airtime_mvc/build/schema.xml                                  | 2 +-
 airtime_mvc/build/sql/schema.sql                              | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/models/airtime/map/PodcastEpisodesTableMap.php b/airtime_mvc/application/models/airtime/map/PodcastEpisodesTableMap.php
index 8a1bb9b1d..ef3895069 100644
--- a/airtime_mvc/application/models/airtime/map/PodcastEpisodesTableMap.php
+++ b/airtime_mvc/application/models/airtime/map/PodcastEpisodesTableMap.php
@@ -40,7 +40,7 @@ class PodcastEpisodesTableMap extends TableMap
         $this->setPrimaryKeyMethodInfo('podcast_episodes_id_seq');
         // columns
         $this->addPrimaryKey('id', 'DbId', 'INTEGER', true, null, null);
-        $this->addForeignKey('file_id', 'DbFileId', 'INTEGER', 'cc_files', 'id', true, null, null);
+        $this->addForeignKey('file_id', 'DbFileId', 'INTEGER', 'cc_files', 'id', false, null, null);
         $this->addForeignKey('podcast_id', 'DbPodcastId', 'INTEGER', 'podcast', 'id', true, null, null);
         $this->addColumn('publication_date', 'DbPublicationDate', 'TIMESTAMP', true, null, null);
         $this->addColumn('download_url', 'DbDownloadUrl', 'VARCHAR', true, 4096, null);
diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFiles.php b/airtime_mvc/application/models/airtime/om/BaseCcFiles.php
index 3ae31ac58..92ce18cf4 100644
--- a/airtime_mvc/application/models/airtime/om/BaseCcFiles.php
+++ b/airtime_mvc/application/models/airtime/om/BaseCcFiles.php
@@ -7557,7 +7557,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
                 $this->podcastEpisodessScheduledForDeletion = clone $this->collPodcastEpisodess;
                 $this->podcastEpisodessScheduledForDeletion->clear();
             }
-            $this->podcastEpisodessScheduledForDeletion[]= clone $podcastEpisodes;
+            $this->podcastEpisodessScheduledForDeletion[]= $podcastEpisodes;
             $podcastEpisodes->setCcFiles(null);
         }
 
diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php
index d1b46bc7e..80fe0a5ba 100644
--- a/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php
+++ b/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php
@@ -3656,7 +3656,7 @@ abstract class BaseCcFilesQuery extends ModelCriteria
      *
      * @return CcFilesQuery The current query, for fluid interface
      */
-    public function joinPodcastEpisodes($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function joinPodcastEpisodes($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('PodcastEpisodes');
@@ -3691,7 +3691,7 @@ abstract class BaseCcFilesQuery extends ModelCriteria
      *
      * @return   PodcastEpisodesQuery A secondary query class using the current class as primary query
      */
-    public function usePodcastEpisodesQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function usePodcastEpisodesQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         return $this
             ->joinPodcastEpisodes($relationAlias, $joinType)
diff --git a/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesQuery.php b/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesQuery.php
index 640856220..fbf44a00f 100644
--- a/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesQuery.php
+++ b/airtime_mvc/application/models/airtime/om/BasePodcastEpisodesQuery.php
@@ -508,7 +508,7 @@ abstract class BasePodcastEpisodesQuery extends ModelCriteria
      *
      * @return PodcastEpisodesQuery The current query, for fluid interface
      */
-    public function joinCcFiles($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function joinCcFiles($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('CcFiles');
@@ -543,7 +543,7 @@ abstract class BasePodcastEpisodesQuery extends ModelCriteria
      *
      * @return   CcFilesQuery A secondary query class using the current class as primary query
      */
-    public function useCcFilesQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function useCcFilesQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         return $this
             ->joinCcFiles($relationAlias, $joinType)
diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml
index 5f3774f99..c0e701c9e 100644
--- a/airtime_mvc/build/schema.xml
+++ b/airtime_mvc/build/schema.xml
@@ -579,7 +579,7 @@
 
   <table name="podcast_episodes" phpName="PodcastEpisodes">
     <column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
-    <column name="file_id" phpName="DbFileId" type="INTEGER" required="true" />
+    <column name="file_id" phpName="DbFileId" type="INTEGER" />
     <column name="podcast_id" phpName="DbPodcastId" type="INTEGER" required="true" />
     <column name="publication_date" phpName="DbPublicationDate" type="TIMESTAMP" required="true" />
     <column name="download_url" phpName="DbDownloadUrl" type="varchar" size="4096" required="true" />
diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql
index a9c8d9cd5..64f0a2d4d 100644
--- a/airtime_mvc/build/sql/schema.sql
+++ b/airtime_mvc/build/sql/schema.sql
@@ -735,7 +735,7 @@ DROP TABLE IF EXISTS "podcast_episodes" CASCADE;
 CREATE TABLE "podcast_episodes"
 (
     "id" serial NOT NULL,
-    "file_id" INTEGER NOT NULL,
+    "file_id" INTEGER,
     "podcast_id" INTEGER NOT NULL,
     "publication_date" TIMESTAMP NOT NULL,
     "download_url" VARCHAR(4096) NOT NULL,