Merge branch '0.9' of git+ssh://git.catalyst.net.nz/git/public/rscds into 0.9

This commit is contained in:
Andrew McMillan 2008-02-15 15:19:23 +13:00
commit aa732b2f7b
2 changed files with 10 additions and 0 deletions

View File

@ -32,6 +32,11 @@ ALTER TABLE caldav_data ADD CONSTRAINT "caldav_data_logged_user_fkey" FOREIGN KE
ALTER TABLE property DROP CONSTRAINT "$1";
ALTER TABLE property ADD CONSTRAINT "property_changed_by_fkey" FOREIGN KEY (changed_by) REFERENCES usr(user_no) ON UPDATE CASCADE;
ALTER TABLE calendar_item DROP CONSTRAINT "$1";
ALTER TABLE calendar_item ADD CONSTRAINT "calendar_item_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
ALTER TABLE calendar_item DROP CONSTRAINT "$2";
ALTER TABLE calendar_item ADD CONSTRAINT "calendar_item_tz_id_fkey" FOREIGN KEY (tz_id) REFERENCES time_zone(tz_id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
SELECT new_db_revision(1,2,3, 'Mars' );
COMMIT;
ROLLBACK;

View File

@ -32,6 +32,11 @@ ALTER TABLE caldav_data ADD CONSTRAINT "caldav_data_logged_user_fkey" FOREIGN KE
ALTER TABLE property DROP CONSTRAINT "property_changed_by_fkey";
ALTER TABLE property ADD CONSTRAINT "property_changed_by_fkey" FOREIGN KEY (changed_by) REFERENCES usr(user_no) ON UPDATE CASCADE;
ALTER TABLE calendar_item DROP CONSTRAINT "calendar_item_user_no_fkey";
ALTER TABLE calendar_item ADD CONSTRAINT "calendar_item_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
ALTER TABLE calendar_item DROP CONSTRAINT "calendar_item_tz_id_fkey";
ALTER TABLE calendar_item ADD CONSTRAINT "calendar_item_tz_id_fkey" FOREIGN KEY (tz_id) REFERENCES time_zone(tz_id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
SELECT new_db_revision(1,2,3, 'Mars' );
COMMIT;
ROLLBACK;