[vhffs-dev] [1489] 4.3 was misnamed, let's merge 4.1 and 4.2, let's move 4.3 to 4.2

[subversion@xxxxxxxxxxxxx]

Revision: 1489
Author:   gradator
Date:     2009-07-31 17:22:03 +0200 (Fri, 31 Jul 2009)

Log Message:
-----------
4.3 was misnamed, let's merge 4.1 and 4.2, let's move 4.3 to 4.2

Modified Paths:
--------------
    trunk/vhffs-compat/4.1.sql
    trunk/vhffs-compat/4.2.sql

Removed Paths:
-------------
    trunk/vhffs-compat/4.3.sql


Modified: trunk/vhffs-compat/4.1.sql
===================================================================
--- trunk/vhffs-compat/4.1.sql	2009-07-31 14:57:26 UTC (rev 1488)
+++ trunk/vhffs-compat/4.1.sql	2009-07-31 15:22:03 UTC (rev 1489)
@@ -62,3 +62,5 @@
 DELETE FROM vhffs_ml_subscribers WHERE EXISTS ( SELECT 'x' FROM vhffs_ml_subscribers m WHERE LOWER(m.member) = LOWER(vhffs_ml_subscribers.member) AND m.ml_id = vhffs_ml_subscribers.ml_id AND m.sub_id < vhffs_ml_subscribers.sub_id );
 UPDATE vhffs_ml_subscribers set member=LOWER(member);
 
+-- Server encoding is always used to avoid compatibility issues
+ALTER TABLE vhffs_pgsql DROP COLUMN dbencoding;

Modified: trunk/vhffs-compat/4.2.sql
===================================================================
--- trunk/vhffs-compat/4.2.sql	2009-07-31 14:57:26 UTC (rev 1488)
+++ trunk/vhffs-compat/4.2.sql	2009-07-31 15:22:03 UTC (rev 1489)
@@ -1,5 +1,7 @@
--- Server encoding is always used to avoid compatibility issues
-ALTER TABLE vhffs_pgsql DROP COLUMN dbencoding;
-
 -- update_id field is cleared when the user is unsubscribing
 ALTER TABLE vhffs_object_tag ALTER COLUMN updater_id DROP NOT NULL;
+
+-- add the user who modified the object in the object's history
+ALTER TABLE vhffs_history ADD COLUMN source_uid INTEGER DEFAULT NULL;
+ALTER TABLE vhffs_history ADD CONSTRAINT fk_vhffs_history_vhffs_users FOREIGN KEY (source_uid) REFERENCES vhffs_users(uid);
+

Deleted: trunk/vhffs-compat/4.3.sql
===================================================================
--- trunk/vhffs-compat/4.3.sql	2009-07-31 14:57:26 UTC (rev 1488)
+++ trunk/vhffs-compat/4.3.sql	2009-07-31 15:22:03 UTC (rev 1489)
@@ -1,2 +0,0 @@
-ALTER TABLE vhffs_history ADD COLUMN source_uid INTEGER DEFAULT NULL;
-ALTER TABLE vhffs_history ADD CONSTRAINT fk_vhffs_history_vhffs_users FOREIGN KEY (source_uid) REFERENCES vhffs_users(uid);