[evolvis-commits] r7624: Still reducing the diff between 2.6-from-2.5 and 2.6-from-scratch. ↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 15:45:06 CET 2011


Author: mirabilos
Date: 2011-02-24 15:45:05 +0100 (Thu, 24 Feb 2011)
New Revision: 7624

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sf-2.6-complete.sql
   trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sf2.5-to-sf2.6.sql
Log:
Still reducing the diff between 2.6-from-2.5 and 2.6-from-scratch.


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sf-2.6-complete.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sf-2.6-complete.sql	2011-02-24 14:45:04 UTC (rev 7623)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sf-2.6-complete.sql	2011-02-24 14:45:05 UTC (rev 7624)
@@ -5679,34 +5679,10 @@
 ALTER TABLE user_group ADD CONSTRAINT user_group_user_id_fk
 	FOREIGN KEY (user_id) REFERENCES users(user_id) MATCH FULL ;
 
---
--- TOC Entry ID 650 (OID 24185)
---
--- Name: "RI_ConstraintTrigger_24184" Type: TRIGGER Owner: tperdue
---
+ALTER TABLE user_group ADD CONSTRAINT user_group_group_id_fk
+	FOREIGN KEY (group_id) REFERENCES groups(group_id) MATCH FULL ;
 
-CREATE CONSTRAINT TRIGGER "user_group_group_id_fk" AFTER INSERT OR UPDATE ON "user_group"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_check_ins" ('user_group_group_id_fk', 'user_group', 'groups', 'FULL', 'group_id', 'group_id');
-
 --
--- TOC Entry ID 629 (OID 24187)
---
--- Name: "RI_ConstraintTrigger_24186" Type: TRIGGER Owner: tperdue
---
-
-CREATE CONSTRAINT TRIGGER "user_group_group_id_fk" AFTER DELETE ON "groups"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_noaction_del" ('user_group_group_id_fk', 'user_group', 'groups', 'FULL', 'group_id', 'group_id');
-
---
--- TOC Entry ID 630 (OID 24189)
---
--- Name: "RI_ConstraintTrigger_24188" Type: TRIGGER Owner: tperdue
---
-
-CREATE CONSTRAINT TRIGGER "user_group_group_id_fk" AFTER UPDATE ON "groups"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_noaction_upd" ('user_group_group_id_fk', 'user_group', 'groups', 'FULL', 'group_id', 'group_id');
-
-
-ALTER TABLE forum ADD CONSTRAINT forum_posted_by_fk FOREIGN KEY (posted_by) REFERENCES users(user_id) MATCH FULL ;
-
---
 -- TOC Entry ID 600 (OID 24197)
 --
 -- Name: "RI_ConstraintTrigger_24196" Type: TRIGGER Owner: tperdue
@@ -5730,55 +5706,10 @@
 
 CREATE CONSTRAINT TRIGGER "forum_group_forum_id_fk" AFTER UPDATE ON "forum_group_list"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_noaction_upd" ('forum_group_forum_id_fk', 'forum', 'forum_group_list', 'FULL', 'group_forum_id', 'group_forum_id');
 
---
--- TOC Entry ID 605 (OID 24203)
---
--- Name: "RI_ConstraintTrigger_24202" Type: TRIGGER Owner: tperdue
---
+ALTER TABLE forum_group_list ADD CONSTRAINT forum_group_list_group_id_fk
+	FOREIGN KEY (group_id) REFERENCES groups(group_id) MATCH FULL ;
 
-CREATE CONSTRAINT TRIGGER "forum_group_list_group_id_fk" AFTER INSERT OR UPDATE ON "forum_group_list"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_check_ins" ('forum_group_list_group_id_fk', 'forum_group_list', 'groups', 'FULL', 'group_id', 'group_id');
-
 --
--- TOC Entry ID 631 (OID 24205)
---
--- Name: "RI_ConstraintTrigger_24204" Type: TRIGGER Owner: tperdue
---
-
-CREATE CONSTRAINT TRIGGER "forum_group_list_group_id_fk" AFTER DELETE ON "groups"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_noaction_del" ('forum_group_list_group_id_fk', 'forum_group_list', 'groups', 'FULL', 'group_id', 'group_id');
-
---
--- TOC Entry ID 632 (OID 24207)
---
--- Name: "RI_ConstraintTrigger_24206" Type: TRIGGER Owner: tperdue
---
-
-CREATE CONSTRAINT TRIGGER "forum_group_list_group_id_fk" AFTER UPDATE ON "groups"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_noaction_upd" ('forum_group_list_group_id_fk', 'forum_group_list', 'groups', 'FULL', 'group_id', 'group_id');
-
---
--- TOC Entry ID 601 (OID 24209)
---
--- Name: "RI_ConstraintTrigger_24208" Type: TRIGGER Owner: tperdue
---
-
-CREATE CONSTRAINT TRIGGER "forum_posted_by_fk" AFTER INSERT OR UPDATE ON "forum"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_check_ins" ('forum_posted_by_fk', 'forum', 'users', 'FULL', 'posted_by', 'user_id');
-
---
--- TOC Entry ID 655 (OID 24211)
---
--- Name: "RI_ConstraintTrigger_24210" Type: TRIGGER Owner: tperdue
---
-
-CREATE CONSTRAINT TRIGGER "forum_posted_by_fk" AFTER DELETE ON "users"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_noaction_del" ('forum_posted_by_fk', 'forum', 'users', 'FULL', 'posted_by', 'user_id');
-
---
--- TOC Entry ID 656 (OID 24213)
---
--- Name: "RI_ConstraintTrigger_24212" Type: TRIGGER Owner: tperdue
---
-
-CREATE CONSTRAINT TRIGGER "forum_posted_by_fk" AFTER UPDATE ON "users"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_noaction_upd" ('forum_posted_by_fk', 'forum', 'users', 'FULL', 'posted_by', 'user_id');
-
---
 -- TOC Entry ID 602 (OID 24215)
 --
 -- Name: "RI_ConstraintTrigger_24214" Type: TRIGGER Owner: tperdue
@@ -5808,25 +5739,10 @@
 -- Name: "RI_ConstraintTrigger_24220" Type: TRIGGER Owner: tperdue
 --
 
-CREATE CONSTRAINT TRIGGER "project_group_list_group_id_fk" AFTER INSERT OR UPDATE ON "project_group_list"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_check_ins" ('project_group_list_group_id_fk', 'project_group_list', 'groups', 'FULL', 'group_id', 'group_id');
+ALTER TABLE project_group_list ADD CONSTRAINT project_group_list_group_id_fk
+	FOREIGN KEY (group_id) REFERENCES groups(group_id) MATCH FULL ;
 
 --
--- TOC Entry ID 633 (OID 24223)
---
--- Name: "RI_ConstraintTrigger_24222" Type: TRIGGER Owner: tperdue
---
-
-CREATE CONSTRAINT TRIGGER "project_group_list_group_id_fk" AFTER DELETE ON "groups"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_noaction_del" ('project_group_list_group_id_fk', 'project_group_list', 'groups', 'FULL', 'group_id', 'group_id');
-
---
--- TOC Entry ID 634 (OID 24225)
---
--- Name: "RI_ConstraintTrigger_24224" Type: TRIGGER Owner: tperdue
---
-
-CREATE CONSTRAINT TRIGGER "project_group_list_group_id_fk" AFTER UPDATE ON "groups"  NOT DEFERRABLE INITIALLY IMMEDIATE FOR EACH ROW EXECUTE PROCEDURE "RI_FKey_noaction_upd" ('project_group_list_group_id_fk', 'project_group_list', 'groups', 'FULL', 'group_id', 'group_id');
-
---
 -- TOC Entry ID 644 (OID 24227)
 --
 -- Name: "RI_ConstraintTrigger_24226" Type: TRIGGER Owner: tperdue

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sf2.5-to-sf2.6.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sf2.5-to-sf2.6.sql	2011-02-24 14:45:04 UTC (rev 7623)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/sf2.5-to-sf2.6.sql	2011-02-24 14:45:05 UTC (rev 7624)
@@ -656,10 +656,10 @@
 	FOREIGN KEY (user_id) REFERENCES users(user_id) MATCH FULL ;
 -- ALTER TABLE forum ADD CONSTRAINT forum_posted_by_fk
 --	FOREIGN KEY (posted_by) REFERENCES users(user_id) MATCH FULL ;
-ALTER TABLE forum_group_list ADD CONSTRAINT forum_group_list_group_id_fk
-	FOREIGN KEY (group_id) REFERENCES groups(group_id) MATCH FULL ;
-ALTER TABLE project_task ADD CONSTRAINT project_task_created_by_fk
-	FOREIGN KEY (created_by) REFERENCES users(user_id) MATCH FULL ;
+-- ALTER TABLE forum_group_list ADD CONSTRAINT forum_group_list_group_id_fk
+--	FOREIGN KEY (group_id) REFERENCES groups(group_id) MATCH FULL ;
+-- ALTER TABLE project_task ADD CONSTRAINT project_task_created_by_fk
+-- 	FOREIGN KEY (created_by) REFERENCES users(user_id) MATCH FULL ;
 ALTER TABLE users ADD CONSTRAINT users_languageid_fk
 	FOREIGN KEY (language) REFERENCES supported_languages(language_id) MATCH FULL ;
 
@@ -1400,6 +1400,11 @@
 CREATE UNIQUE INDEX statssubdpages_oid ON stats_subd_pages USING btree (oid);
 
 -- Add two new themes
-
 INSERT INTO themes (dirname, fullname) VALUES ('debian', 'Debian') ;
 INSERT INTO themes (dirname, fullname) VALUES ('savannah', 'Savannah') ;
+
+-- Constraints
+ALTER TABLE project_group_list ADD CONSTRAINT project_group_list_group_id_fk
+	FOREIGN KEY (group_id) REFERENCES groups(group_id) MATCH FULL ;
+ALTER TABLE user_group ADD CONSTRAINT user_group_group_id_fk
+	FOREIGN KEY (group_id) REFERENCES groups(group_id) MATCH FULL ;



More information about the evolvis-commits mailing list