CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table

chaning column name to playout_status

airtime_mvc/application/models/Schedule.php

@@ -237,7 +237,7 @@ class Application_Model_Schedule {
         sched.starts AS sched_starts, sched.ends AS sched_ends, sched.id AS sched_id,
         sched.cue_in AS cue_in, sched.cue_out AS cue_out,
         sched.fade_in AS fade_in, sched.fade_out AS fade_out,
-        sched.status AS sched_status,
+        sched.playout_status AS playout_status,
 
         ft.track_title AS file_track_title, ft.artist_name AS file_artist_name,
         ft.album_title AS file_album_title, ft.length AS file_length

airtime_mvc/application/models/ShowBuilder.php

@@ -68,7 +68,7 @@ class Application_Model_ShowBuilder {
     //information about whether a track is inside|boundary|outside a show.
     private function getItemStatus($p_item, &$row) {
 
-        $row["status"] = intval($p_item["sched_status"]);
+        $row["status"] = intval($p_item["playout_status"]);
     }
 
     private function getRowTimestamp($p_item, &$row) {

airtime_mvc/application/models/airtime/CcShowInstances.php

@@ -117,7 +117,7 @@ class CcShowInstances extends BaseCcShowInstances {
         CcScheduleQuery::create()
             ->filterByDbInstanceId($this->id)
             ->filterByDbEnds($this->ends, Criteria::LESS_EQUAL)
-            ->update(array('DbStatus' => 1), $con);
+            ->update(array('DbPlayoutStatus' => 1), $con);
 
         Logging::log("updating status for in show items.");
 
@@ -126,13 +126,13 @@ class CcShowInstances extends BaseCcShowInstances {
             ->filterByDbInstanceId($this->id)
             ->filterByDbStarts($this->ends, Criteria::LESS_THAN)
             ->filterByDbEnds($this->ends, Criteria::GREATER_THAN)
-            ->update(array('DbStatus' => 2), $con);
+            ->update(array('DbPlayoutStatus' => 2), $con);
 
         //scheduled track is overbooked.
         CcScheduleQuery::create()
             ->filterByDbInstanceId($this->id)
             ->filterByDbStarts($this->ends, Criteria::GREATER_THAN)
-            ->update(array('DbStatus' => 0), $con);
+            ->update(array('DbPlayoutStatus' => 0), $con);
 
     }
 

airtime_mvc/application/models/airtime/map/CcScheduleTableMap.php

@@ -49,7 +49,7 @@ class CcScheduleTableMap extends TableMap {
 		$this->addColumn('CUE_OUT', 'DbCueOut', 'VARCHAR', false, null, '00:00:00');
 		$this->addColumn('MEDIA_ITEM_PLAYED', 'DbMediaItemPlayed', 'BOOLEAN', false, null, false);
 		$this->addForeignKey('INSTANCE_ID', 'DbInstanceId', 'INTEGER', 'cc_show_instances', 'ID', true, null, null);
-		$this->addColumn('STATUS', 'DbStatus', 'SMALLINT', true, null, 1);
+		$this->addColumn('PLAYOUT_STATUS', 'DbPlayoutStatus', 'SMALLINT', true, null, 1);
 		// validators
 	} // initialize()
 

airtime_mvc/application/models/airtime/om/BaseCcSchedule.php

@@ -97,11 +97,11 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 	protected $instance_id;
 
 	/**
-	 * The value for the status field.
+	 * The value for the playout_status field.
 	 * Note: this column has a database default value of: 1
 	 * @var        int
 	 */
-	protected $status;
+	protected $playout_status;
 
 	/**
 	 * @var        CcShowInstances
@@ -144,7 +144,7 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 		$this->cue_in = '00:00:00';
 		$this->cue_out = '00:00:00';
 		$this->media_item_played = false;
-		$this->status = 1;
+		$this->playout_status = 1;
 	}
 
 	/**
@@ -360,13 +360,13 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 	}
 
 	/**
-	 * Get the [status] column value.
+	 * Get the [playout_status] column value.
 	 * 
 	 * @return     int
 	 */
-	public function getDbStatus()
+	public function getDbPlayoutStatus()
 	{
-		return $this->status;
+		return $this->playout_status;
 	}
 
 	/**
@@ -716,24 +716,24 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 	} // setDbInstanceId()
 
 	/**
-	 * Set the value of [status] column.
+	 * Set the value of [playout_status] column.
 	 * 
 	 * @param      int $v new value
 	 * @return     CcSchedule The current object (for fluent API support)
 	 */
-	public function setDbStatus($v)
+	public function setDbPlayoutStatus($v)
 	{
 		if ($v !== null) {
 			$v = (int) $v;
 		}
 
-		if ($this->status !== $v || $this->isNew()) {
+		if ($this->playout_status !== $v || $this->isNew()) {
-			$this->status = $v;
+			$this->playout_status = $v;
-			$this->modifiedColumns[] = CcSchedulePeer::STATUS;
+			$this->modifiedColumns[] = CcSchedulePeer::PLAYOUT_STATUS;
 		}
 
 		return $this;
-	} // setDbStatus()
+	} // setDbPlayoutStatus()
 
 	/**
 	 * Indicates whether the columns in this object are only set to default values.
@@ -769,7 +769,7 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 				return false;
 			}
 
-			if ($this->status !== 1) {
+			if ($this->playout_status !== 1) {
 				return false;
 			}
 
@@ -806,7 +806,7 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 			$this->cue_out = ($row[$startcol + 8] !== null) ? (string) $row[$startcol + 8] : null;
 			$this->media_item_played = ($row[$startcol + 9] !== null) ? (boolean) $row[$startcol + 9] : null;
 			$this->instance_id = ($row[$startcol + 10] !== null) ? (int) $row[$startcol + 10] : null;
-			$this->status = ($row[$startcol + 11] !== null) ? (int) $row[$startcol + 11] : null;
+			$this->playout_status = ($row[$startcol + 11] !== null) ? (int) $row[$startcol + 11] : null;
 			$this->resetModified();
 
 			$this->setNew(false);
@@ -1195,7 +1195,7 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 				return $this->getDbInstanceId();
 				break;
 			case 11:
-				return $this->getDbStatus();
+				return $this->getDbPlayoutStatus();
 				break;
 			default:
 				return null;
@@ -1232,7 +1232,7 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 			$keys[8] => $this->getDbCueOut(),
 			$keys[9] => $this->getDbMediaItemPlayed(),
 			$keys[10] => $this->getDbInstanceId(),
-			$keys[11] => $this->getDbStatus(),
+			$keys[11] => $this->getDbPlayoutStatus(),
 		);
 		if ($includeForeignObjects) {
 			if (null !== $this->aCcShowInstances) {
@@ -1306,7 +1306,7 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 				$this->setDbInstanceId($value);
 				break;
 			case 11:
-				$this->setDbStatus($value);
+				$this->setDbPlayoutStatus($value);
 				break;
 		} // switch()
 	}
@@ -1343,7 +1343,7 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 		if (array_key_exists($keys[8], $arr)) $this->setDbCueOut($arr[$keys[8]]);
 		if (array_key_exists($keys[9], $arr)) $this->setDbMediaItemPlayed($arr[$keys[9]]);
 		if (array_key_exists($keys[10], $arr)) $this->setDbInstanceId($arr[$keys[10]]);
-		if (array_key_exists($keys[11], $arr)) $this->setDbStatus($arr[$keys[11]]);
+		if (array_key_exists($keys[11], $arr)) $this->setDbPlayoutStatus($arr[$keys[11]]);
 	}
 
 	/**
@@ -1366,7 +1366,7 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 		if ($this->isColumnModified(CcSchedulePeer::CUE_OUT)) $criteria->add(CcSchedulePeer::CUE_OUT, $this->cue_out);
 		if ($this->isColumnModified(CcSchedulePeer::MEDIA_ITEM_PLAYED)) $criteria->add(CcSchedulePeer::MEDIA_ITEM_PLAYED, $this->media_item_played);
 		if ($this->isColumnModified(CcSchedulePeer::INSTANCE_ID)) $criteria->add(CcSchedulePeer::INSTANCE_ID, $this->instance_id);
-		if ($this->isColumnModified(CcSchedulePeer::STATUS)) $criteria->add(CcSchedulePeer::STATUS, $this->status);
+		if ($this->isColumnModified(CcSchedulePeer::PLAYOUT_STATUS)) $criteria->add(CcSchedulePeer::PLAYOUT_STATUS, $this->playout_status);
 
 		return $criteria;
 	}
@@ -1438,7 +1438,7 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 		$copyObj->setDbCueOut($this->cue_out);
 		$copyObj->setDbMediaItemPlayed($this->media_item_played);
 		$copyObj->setDbInstanceId($this->instance_id);
-		$copyObj->setDbStatus($this->status);
+		$copyObj->setDbPlayoutStatus($this->playout_status);
 
 		$copyObj->setNew(true);
 		$copyObj->setDbId(NULL); // this is a auto-increment column, so set to default value
@@ -1600,7 +1600,7 @@ abstract class BaseCcSchedule extends BaseObject  implements Persistent
 		$this->cue_out = null;
 		$this->media_item_played = null;
 		$this->instance_id = null;
-		$this->status = null;
+		$this->playout_status = null;
 		$this->alreadyInSave = false;
 		$this->alreadyInValidation = false;
 		$this->clearAllReferences();

airtime_mvc/application/models/airtime/om/BaseCcSchedulePeer.php

@@ -64,8 +64,8 @@ abstract class BaseCcSchedulePeer {
 	/** the column name for the INSTANCE_ID field */
 	const INSTANCE_ID = 'cc_schedule.INSTANCE_ID';
 
-	/** the column name for the STATUS field */
+	/** the column name for the PLAYOUT_STATUS field */
-	const STATUS = 'cc_schedule.STATUS';
+	const PLAYOUT_STATUS = 'cc_schedule.PLAYOUT_STATUS';
 
 	/**
 	 * An identiy map to hold any loaded instances of CcSchedule objects.
@@ -83,11 +83,11 @@ abstract class BaseCcSchedulePeer {
 	 * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
 	 */
 	private static $fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array ('DbId', 'DbStarts', 'DbEnds', 'DbFileId', 'DbClipLength', 'DbFadeIn', 'DbFadeOut', 'DbCueIn', 'DbCueOut', 'DbMediaItemPlayed', 'DbInstanceId', 'DbStatus', ),
+		BasePeer::TYPE_PHPNAME => array ('DbId', 'DbStarts', 'DbEnds', 'DbFileId', 'DbClipLength', 'DbFadeIn', 'DbFadeOut', 'DbCueIn', 'DbCueOut', 'DbMediaItemPlayed', 'DbInstanceId', 'DbPlayoutStatus', ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbStarts', 'dbEnds', 'dbFileId', 'dbClipLength', 'dbFadeIn', 'dbFadeOut', 'dbCueIn', 'dbCueOut', 'dbMediaItemPlayed', 'dbInstanceId', 'dbStatus', ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbStarts', 'dbEnds', 'dbFileId', 'dbClipLength', 'dbFadeIn', 'dbFadeOut', 'dbCueIn', 'dbCueOut', 'dbMediaItemPlayed', 'dbInstanceId', 'dbPlayoutStatus', ),
-		BasePeer::TYPE_COLNAME => array (self::ID, self::STARTS, self::ENDS, self::FILE_ID, self::CLIP_LENGTH, self::FADE_IN, self::FADE_OUT, self::CUE_IN, self::CUE_OUT, self::MEDIA_ITEM_PLAYED, self::INSTANCE_ID, self::STATUS, ),
+		BasePeer::TYPE_COLNAME => array (self::ID, self::STARTS, self::ENDS, self::FILE_ID, self::CLIP_LENGTH, self::FADE_IN, self::FADE_OUT, self::CUE_IN, self::CUE_OUT, self::MEDIA_ITEM_PLAYED, self::INSTANCE_ID, self::PLAYOUT_STATUS, ),
-		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'STARTS', 'ENDS', 'FILE_ID', 'CLIP_LENGTH', 'FADE_IN', 'FADE_OUT', 'CUE_IN', 'CUE_OUT', 'MEDIA_ITEM_PLAYED', 'INSTANCE_ID', 'STATUS', ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID', 'STARTS', 'ENDS', 'FILE_ID', 'CLIP_LENGTH', 'FADE_IN', 'FADE_OUT', 'CUE_IN', 'CUE_OUT', 'MEDIA_ITEM_PLAYED', 'INSTANCE_ID', 'PLAYOUT_STATUS', ),
-		BasePeer::TYPE_FIELDNAME => array ('id', 'starts', 'ends', 'file_id', 'clip_length', 'fade_in', 'fade_out', 'cue_in', 'cue_out', 'media_item_played', 'instance_id', 'status', ),
+		BasePeer::TYPE_FIELDNAME => array ('id', 'starts', 'ends', 'file_id', 'clip_length', 'fade_in', 'fade_out', 'cue_in', 'cue_out', 'media_item_played', 'instance_id', 'playout_status', ),
 		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
 	);
 
@@ -98,11 +98,11 @@ abstract class BaseCcSchedulePeer {
 	 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
 	 */
 	private static $fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbStarts' => 1, 'DbEnds' => 2, 'DbFileId' => 3, 'DbClipLength' => 4, 'DbFadeIn' => 5, 'DbFadeOut' => 6, 'DbCueIn' => 7, 'DbCueOut' => 8, 'DbMediaItemPlayed' => 9, 'DbInstanceId' => 10, 'DbStatus' => 11, ),
+		BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbStarts' => 1, 'DbEnds' => 2, 'DbFileId' => 3, 'DbClipLength' => 4, 'DbFadeIn' => 5, 'DbFadeOut' => 6, 'DbCueIn' => 7, 'DbCueOut' => 8, 'DbMediaItemPlayed' => 9, 'DbInstanceId' => 10, 'DbPlayoutStatus' => 11, ),
-		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbStarts' => 1, 'dbEnds' => 2, 'dbFileId' => 3, 'dbClipLength' => 4, 'dbFadeIn' => 5, 'dbFadeOut' => 6, 'dbCueIn' => 7, 'dbCueOut' => 8, 'dbMediaItemPlayed' => 9, 'dbInstanceId' => 10, 'dbStatus' => 11, ),
+		BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbStarts' => 1, 'dbEnds' => 2, 'dbFileId' => 3, 'dbClipLength' => 4, 'dbFadeIn' => 5, 'dbFadeOut' => 6, 'dbCueIn' => 7, 'dbCueOut' => 8, 'dbMediaItemPlayed' => 9, 'dbInstanceId' => 10, 'dbPlayoutStatus' => 11, ),
-		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::STARTS => 1, self::ENDS => 2, self::FILE_ID => 3, self::CLIP_LENGTH => 4, self::FADE_IN => 5, self::FADE_OUT => 6, self::CUE_IN => 7, self::CUE_OUT => 8, self::MEDIA_ITEM_PLAYED => 9, self::INSTANCE_ID => 10, self::STATUS => 11, ),
+		BasePeer::TYPE_COLNAME => array (self::ID => 0, self::STARTS => 1, self::ENDS => 2, self::FILE_ID => 3, self::CLIP_LENGTH => 4, self::FADE_IN => 5, self::FADE_OUT => 6, self::CUE_IN => 7, self::CUE_OUT => 8, self::MEDIA_ITEM_PLAYED => 9, self::INSTANCE_ID => 10, self::PLAYOUT_STATUS => 11, ),
-		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'STARTS' => 1, 'ENDS' => 2, 'FILE_ID' => 3, 'CLIP_LENGTH' => 4, 'FADE_IN' => 5, 'FADE_OUT' => 6, 'CUE_IN' => 7, 'CUE_OUT' => 8, 'MEDIA_ITEM_PLAYED' => 9, 'INSTANCE_ID' => 10, 'STATUS' => 11, ),
+		BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'STARTS' => 1, 'ENDS' => 2, 'FILE_ID' => 3, 'CLIP_LENGTH' => 4, 'FADE_IN' => 5, 'FADE_OUT' => 6, 'CUE_IN' => 7, 'CUE_OUT' => 8, 'MEDIA_ITEM_PLAYED' => 9, 'INSTANCE_ID' => 10, 'PLAYOUT_STATUS' => 11, ),
-		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'starts' => 1, 'ends' => 2, 'file_id' => 3, 'clip_length' => 4, 'fade_in' => 5, 'fade_out' => 6, 'cue_in' => 7, 'cue_out' => 8, 'media_item_played' => 9, 'instance_id' => 10, 'status' => 11, ),
+		BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'starts' => 1, 'ends' => 2, 'file_id' => 3, 'clip_length' => 4, 'fade_in' => 5, 'fade_out' => 6, 'cue_in' => 7, 'cue_out' => 8, 'media_item_played' => 9, 'instance_id' => 10, 'playout_status' => 11, ),
 		BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
 	);
 
@@ -186,7 +186,7 @@ abstract class BaseCcSchedulePeer {
 			$criteria->addSelectColumn(CcSchedulePeer::CUE_OUT);
 			$criteria->addSelectColumn(CcSchedulePeer::MEDIA_ITEM_PLAYED);
 			$criteria->addSelectColumn(CcSchedulePeer::INSTANCE_ID);
-			$criteria->addSelectColumn(CcSchedulePeer::STATUS);
+			$criteria->addSelectColumn(CcSchedulePeer::PLAYOUT_STATUS);
 		} else {
 			$criteria->addSelectColumn($alias . '.ID');
 			$criteria->addSelectColumn($alias . '.STARTS');
@@ -199,7 +199,7 @@ abstract class BaseCcSchedulePeer {
 			$criteria->addSelectColumn($alias . '.CUE_OUT');
 			$criteria->addSelectColumn($alias . '.MEDIA_ITEM_PLAYED');
 			$criteria->addSelectColumn($alias . '.INSTANCE_ID');
-			$criteria->addSelectColumn($alias . '.STATUS');
+			$criteria->addSelectColumn($alias . '.PLAYOUT_STATUS');
 		}
 	}
 

airtime_mvc/application/models/airtime/om/BaseCcScheduleQuery.php

@@ -17,7 +17,7 @@
  * @method     CcScheduleQuery orderByDbCueOut($order = Criteria::ASC) Order by the cue_out column
  * @method     CcScheduleQuery orderByDbMediaItemPlayed($order = Criteria::ASC) Order by the media_item_played column
  * @method     CcScheduleQuery orderByDbInstanceId($order = Criteria::ASC) Order by the instance_id column
- * @method     CcScheduleQuery orderByDbStatus($order = Criteria::ASC) Order by the status column
+ * @method     CcScheduleQuery orderByDbPlayoutStatus($order = Criteria::ASC) Order by the playout_status column
  *
  * @method     CcScheduleQuery groupByDbId() Group by the id column
  * @method     CcScheduleQuery groupByDbStarts() Group by the starts column
@@ -30,7 +30,7 @@
  * @method     CcScheduleQuery groupByDbCueOut() Group by the cue_out column
  * @method     CcScheduleQuery groupByDbMediaItemPlayed() Group by the media_item_played column
  * @method     CcScheduleQuery groupByDbInstanceId() Group by the instance_id column
- * @method     CcScheduleQuery groupByDbStatus() Group by the status column
+ * @method     CcScheduleQuery groupByDbPlayoutStatus() Group by the playout_status column
  *
  * @method     CcScheduleQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
  * @method     CcScheduleQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
@@ -58,7 +58,7 @@
  * @method     CcSchedule findOneByDbCueOut(string $cue_out) Return the first CcSchedule filtered by the cue_out column
  * @method     CcSchedule findOneByDbMediaItemPlayed(boolean $media_item_played) Return the first CcSchedule filtered by the media_item_played column
  * @method     CcSchedule findOneByDbInstanceId(int $instance_id) Return the first CcSchedule filtered by the instance_id column
- * @method     CcSchedule findOneByDbStatus(int $status) Return the first CcSchedule filtered by the status column
+ * @method     CcSchedule findOneByDbPlayoutStatus(int $playout_status) Return the first CcSchedule filtered by the playout_status column
  *
  * @method     array findByDbId(int $id) Return CcSchedule objects filtered by the id column
  * @method     array findByDbStarts(string $starts) Return CcSchedule objects filtered by the starts column
@@ -71,7 +71,7 @@
  * @method     array findByDbCueOut(string $cue_out) Return CcSchedule objects filtered by the cue_out column
  * @method     array findByDbMediaItemPlayed(boolean $media_item_played) Return CcSchedule objects filtered by the media_item_played column
  * @method     array findByDbInstanceId(int $instance_id) Return CcSchedule objects filtered by the instance_id column
- * @method     array findByDbStatus(int $status) Return CcSchedule objects filtered by the status column
+ * @method     array findByDbPlayoutStatus(int $playout_status) Return CcSchedule objects filtered by the playout_status column
  *
  * @package    propel.generator.airtime.om
  */
@@ -468,24 +468,24 @@ abstract class BaseCcScheduleQuery extends ModelCriteria
 	}
 
 	/**
-	 * Filter the query on the status column
+	 * Filter the query on the playout_status column
 	 * 
-	 * @param     int|array $dbStatus The value to use as filter.
+	 * @param     int|array $dbPlayoutStatus The value to use as filter.
 	 *            Accepts an associative array('min' => $minValue, 'max' => $maxValue)
 	 * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
 	 *
 	 * @return    CcScheduleQuery The current query, for fluid interface
 	 */
-	public function filterByDbStatus($dbStatus = null, $comparison = null)
+	public function filterByDbPlayoutStatus($dbPlayoutStatus = null, $comparison = null)
 	{
-		if (is_array($dbStatus)) {
+		if (is_array($dbPlayoutStatus)) {
 			$useMinMax = false;
-			if (isset($dbStatus['min'])) {
+			if (isset($dbPlayoutStatus['min'])) {
-				$this->addUsingAlias(CcSchedulePeer::STATUS, $dbStatus['min'], Criteria::GREATER_EQUAL);
+				$this->addUsingAlias(CcSchedulePeer::PLAYOUT_STATUS, $dbPlayoutStatus['min'], Criteria::GREATER_EQUAL);
 				$useMinMax = true;
 			}
-			if (isset($dbStatus['max'])) {
+			if (isset($dbPlayoutStatus['max'])) {
-				$this->addUsingAlias(CcSchedulePeer::STATUS, $dbStatus['max'], Criteria::LESS_EQUAL);
+				$this->addUsingAlias(CcSchedulePeer::PLAYOUT_STATUS, $dbPlayoutStatus['max'], Criteria::LESS_EQUAL);
 				$useMinMax = true;
 			}
 			if ($useMinMax) {
@@ -495,7 +495,7 @@ abstract class BaseCcScheduleQuery extends ModelCriteria
 				$comparison = Criteria::IN;
 			}
 		}
-		return $this->addUsingAlias(CcSchedulePeer::STATUS, $dbStatus, $comparison);
+		return $this->addUsingAlias(CcSchedulePeer::PLAYOUT_STATUS, $dbPlayoutStatus, $comparison);
 	}
 
 	/**

airtime_mvc/build/schema.xml

@@ -280,7 +280,7 @@
     <column name="cue_out" phpName="DbCueOut" type="VARCHAR" sqlType="interval" required="false" defaultValue="00:00:00"/>
     <column name="media_item_played" phpName="DbMediaItemPlayed" type="BOOLEAN" required="false" defaultValue="0"/>
     <column name="instance_id" phpName="DbInstanceId" type="INTEGER" required="true"/>
-    <column name="status" phpName="DbStatus" type="SMALLINT" required="true" defaultValue="1"/>
+    <column name="playout_status" phpName="DbPlayoutStatus" type="SMALLINT" required="true" defaultValue="1"/>
     <!-- This foreign key is still useful even though it may seem we don't ever delete cc_show_instances anymore.
         We will do delete them in some cases (when editing a show and changing the repeating days of the week
         for example. \

airtime_mvc/build/sql/schema.sql

@@ -371,7 +371,7 @@ CREATE TABLE "cc_schedule"
 	"cue_out" interval default '00:00:00',
 	"media_item_played" BOOLEAN default 'f',
 	"instance_id" INTEGER  NOT NULL,
-	"status" INT2 default 1 NOT NULL,
+	"playout_status" INT2 default 1 NOT NULL,
 	PRIMARY KEY ("id")
 );