CC-3036: Deleted Show instances reappear

-Renamed deleted_instance to modified_instance
This commit is contained in:
Martin Konecny 2011-11-18 12:20:25 -05:00
parent c773c5c674
commit 9ab47d5eba
8 changed files with 63 additions and 63 deletions

View file

@ -149,11 +149,11 @@
<column name="instance_id" phpName="DbOriginalShow" type="INTEGER" required="false"/>
<column name="file_id" phpName="DbRecordedFile" type="INTEGER" required="false"/>
<column name="time_filled" phpName="DbTimeFilled" type="TIME" />
<!-- The purpose of the deleted_instance column is to mark a show instance that was
<!-- The purpose of the modified_instance column is to mark a show instance that was
deleted when it was part of repeating show. This is useful because the way shows work,
instances can be regenerated if we edit the show, which is unwanted behaviour. This column serves
to ensure that we don't regenerate the instance. -->
<column name="deleted_instance" phpName="DbDeletedInstance" type="BOOLEAN" required="true" defaultValue="false" />
<column name="modified_instance" phpName="DbModifiedInstance" type="BOOLEAN" required="true" defaultValue="false" />
<behavior name="aggregate_column">
<parameter name="name" value="time_filled" />
<parameter name="foreign_table" value="cc_schedule" />

View file

@ -196,7 +196,7 @@ CREATE TABLE "cc_show_instances"
"instance_id" INTEGER,
"file_id" INTEGER,
"time_filled" TIME,
"deleted_instance" BOOLEAN default 'f' NOT NULL,
"modified_instance" BOOLEAN default 'f' NOT NULL,
PRIMARY KEY ("id")
);