[Rt-commit] [svn] r858 - in rt/branches/rt-3.3: . etc/upgrade/3.3.0

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Sun May  9 21:27:33 2004
New Revision: 858

Modified:
   rt/branches/rt-3.3/   (props changed)
   rt/branches/rt-3.3/Makefile.in
   rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.Pg
   rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.mysql
Log:
 ----------------------------------------------------------------------
 r1515 at tinbook:  jesse | 2004-05-10T01:26:38.232023Z
 
 Improved 3.1->3.3 migration support
 ----------------------------------------------------------------------


Modified: rt/branches/rt-3.3/Makefile.in
==============================================================================
--- rt/branches/rt-3.3/Makefile.in	(original)
+++ rt/branches/rt-3.3/Makefile.in	Sun May  9 21:27:33 2004
@@ -212,9 +212,9 @@
 	@echo ""
 	@echo "For each item in that directory whose name is greater than"
 	@echo "your previously installed RT version, run:"
-	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --action schema --datadir etc/upgrade/<version>"
-	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --action acl --datadir etc/upgrade/<version>"
-	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --action insert --datadir etc/upgrade/<version>"
+	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --action schema --datadir etc/upgrade/<version>"
+	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --action acl --datadir etc/upgrade/<version>"
+	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --action insert --datadir etc/upgrade/<version>"
 
 
 upgrade: config-install dirs files-install fixperms upgrade-instruct

Modified: rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.Pg
==============================================================================
--- rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.Pg	(original)
+++ rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.Pg	Sun May  9 21:27:33 2004
@@ -25,6 +25,8 @@
 
 alter table objectcustomfieldvalues alter column Current SET  default 1;  
 
+UPDATE objectcustomfieldvalues SET Current = 1;
+
 alter table objectcustomfieldvalues add column LargeContent TEXT NULL;
 
 alter table objectcustomfieldvalues add column ContentType varchar(80) NULL;
@@ -57,7 +59,7 @@
 );
 
 
-INSERT into ObjectCustomFields (id, CustomField, ObjectId, SortOrder, Creator, LastUpdatedBy) SELECT  null, id, Queue, SortOrder, Creator, LastUpdatedBy from CustomFields;
+INSERT into ObjectCustomFields (CustomField, ObjectId, SortOrder, Creator, LastUpdatedBy) SELECT  id, Queue, SortOrder, Creator, LastUpdatedBy from CustomFields;
 
 alter table CustomFields add column LookupType varchar(255);
 alter table CustomFields add column Repeated int2;
@@ -70,6 +72,7 @@
 UPDATE CustomFields SET Type = 'Freeform' WHERE Type LIKE 'Freeform%';
 UPDATE CustomFields Set LookupType = 'RT::Queue-RT::Ticket';
 ALTER TABLE CustomFields ALTER COLUMN LookupType SET NOT NULL;
+UPDATE CustomFields Set Repeated = 0;
 ALTER TABLE CustomFields ALTER COLUMN Repeated SET DEFAULT 0;
 ALTER TABLE CustomFields ALTER COLUMN Repeated SET NOT NULL;
 alter table CustomFields drop column Queue; 

Modified: rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.mysql
==============================================================================
--- rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.mysql	(original)
+++ rt/branches/rt-3.3/etc/upgrade/3.3.0/schema.mysql	Sun May  9 21:27:33 2004
@@ -48,7 +48,7 @@
 ) TYPE=InnoDB;
 
 
-INSERT into ObjectCustomFields (id, CustomField, ObjectId, SortOrder, Creator, LastUpdatedBy) SELECT  null, id, Queue, SortOrder, Creator, LastUpdatedBy from CustomFields
+INSERT into ObjectCustomFields (id, CustomField, ObjectId, SortOrder, Creator, LastUpdatedBy) SELECT  null, id, Queue, SortOrder, Creator, LastUpdatedBy from CustomFields;
 
 alter table CustomFields add column LookupType varchar(255) NOT NULL;
 alter table CustomFields add column Repeated int2 NOT NULL DEFAULT 0 ;