From c12d2c2639ef1fec1aff7c26b2c1172902860dd0 Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Fri, 15 Feb 2008 15:04:41 +1300 Subject: [PATCH] Change 7.4 database changes to use 8.x style names. Add patch for 8.x. --- dba/patches/1.2.3.sql | 20 ++++++++++---------- dba/patches/1.2.3a.sql | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 dba/patches/1.2.3a.sql diff --git a/dba/patches/1.2.3.sql b/dba/patches/1.2.3.sql index 2d1a8c69..756ab4be 100644 --- a/dba/patches/1.2.3.sql +++ b/dba/patches/1.2.3.sql @@ -6,31 +6,31 @@ BEGIN; SELECT check_db_revision(1,2,2); ALTER TABLE role_member DROP CONSTRAINT "$1"; -ALTER TABLE role_member ADD CONSTRAINT "$1" FOREIGN KEY (role_no) REFERENCES roles(role_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE role_member ADD CONSTRAINT "role_member_role_no_fkey" FOREIGN KEY (role_no) REFERENCES roles(role_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; ALTER TABLE role_member DROP CONSTRAINT "$2"; -ALTER TABLE role_member ADD CONSTRAINT "$2" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE role_member ADD CONSTRAINT "role_member_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; ALTER TABLE session DROP CONSTRAINT "$1"; -ALTER TABLE session ADD CONSTRAINT "$1" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE session ADD CONSTRAINT "session_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; ALTER TABLE relationship DROP CONSTRAINT "$1"; -ALTER TABLE relationship ADD CONSTRAINT "$1" FOREIGN KEY (from_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE relationship ADD CONSTRAINT "relationship_from_user_fkey" FOREIGN KEY (from_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; ALTER TABLE relationship DROP CONSTRAINT "$2"; -ALTER TABLE relationship ADD CONSTRAINT "$2" FOREIGN KEY (to_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE relationship ADD CONSTRAINT "relationship_to_user_fkey" FOREIGN KEY (to_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; ALTER TABLE usr_setting DROP CONSTRAINT "$1"; -ALTER TABLE usr_setting ADD CONSTRAINT "$1" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE usr_setting ADD CONSTRAINT "usr_setting_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; ALTER TABLE tmp_password DROP CONSTRAINT "$1"; -ALTER TABLE tmp_password ADD CONSTRAINT "$1" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE tmp_password ADD CONSTRAINT "tmp_password_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; ALTER TABLE caldav_data DROP CONSTRAINT "$1"; -ALTER TABLE caldav_data ADD CONSTRAINT "$1" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE caldav_data ADD CONSTRAINT "caldav_data_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; ALTER TABLE caldav_data DROP CONSTRAINT "$2"; -ALTER TABLE caldav_data ADD CONSTRAINT "$2" FOREIGN KEY (logged_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE caldav_data ADD CONSTRAINT "caldav_data_logged_user_fkey" FOREIGN KEY (logged_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; ALTER TABLE property DROP CONSTRAINT "$1"; -ALTER TABLE property ADD CONSTRAINT "$1" FOREIGN KEY (changed_by) REFERENCES usr(user_no) ON UPDATE CASCADE; +ALTER TABLE property ADD CONSTRAINT "property_changed_by_fkey" FOREIGN KEY (changed_by) REFERENCES usr(user_no) ON UPDATE CASCADE; SELECT new_db_revision(1,2,3, 'Mars' ); COMMIT; diff --git a/dba/patches/1.2.3a.sql b/dba/patches/1.2.3a.sql new file mode 100644 index 00000000..899f3e07 --- /dev/null +++ b/dba/patches/1.2.3a.sql @@ -0,0 +1,38 @@ + +-- Add some more cascading updates and deletes. +-- For databases created on or after PostgreSQL 8.0. + +BEGIN; +SELECT check_db_revision(1,2,2); + +ALTER TABLE role_member DROP CONSTRAINT "role_member_role_no_fkey"; +ALTER TABLE role_member ADD CONSTRAINT "role_member_role_no_fkey" FOREIGN KEY (role_no) REFERENCES roles(role_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE role_member DROP CONSTRAINT "role_member_user_no_fkey"; +ALTER TABLE role_member ADD CONSTRAINT "role_member_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; + +ALTER TABLE session DROP CONSTRAINT "session_user_no_fkey"; +ALTER TABLE session ADD CONSTRAINT "session_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; + +ALTER TABLE relationship DROP CONSTRAINT "relationship_from_user_fkey"; +ALTER TABLE relationship ADD CONSTRAINT "relationship_from_user_fkey" FOREIGN KEY (from_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE relationship DROP CONSTRAINT "relationship_to_user_fkey"; +ALTER TABLE relationship ADD CONSTRAINT "relationship_to_user_fkey" FOREIGN KEY (to_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; + +ALTER TABLE usr_setting DROP CONSTRAINT "usr_setting_user_no_fkey"; +ALTER TABLE usr_setting ADD CONSTRAINT "usr_setting_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; + +ALTER TABLE tmp_password DROP CONSTRAINT "tmp_password_user_no_fkey"; +ALTER TABLE tmp_password ADD CONSTRAINT "tmp_password_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; + +ALTER TABLE caldav_data DROP CONSTRAINT "caldav_data_user_no_fkey"; +ALTER TABLE caldav_data ADD CONSTRAINT "caldav_data_user_no_fkey" FOREIGN KEY (user_no) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; +ALTER TABLE caldav_data DROP CONSTRAINT "caldav_data_logged_user_fkey"; +ALTER TABLE caldav_data ADD CONSTRAINT "caldav_data_logged_user_fkey" FOREIGN KEY (logged_user) REFERENCES usr(user_no) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE; + +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; + +SELECT new_db_revision(1,2,3, 'Mars' ); +COMMIT; +ROLLBACK; +