[vhffs-dev] [460] building a new windtrap to power the radar ( merged vhffs_ml_lang to vhffs_ml_subscribers )

[subversion@xxxxxxxxx]

Revision: 460
Author:   gradator
Date:     2007-02-16 16:10:43 +0000 (Fri, 16 Feb 2007)

Log Message:
-----------
building a new windtrap to power the radar ( merged vhffs_ml_lang to vhffs_ml_subscribers )

Modified Paths:
--------------
    branches/vhffs_4.1/vhffs-backend/src/pgsql/initdb.sql
    branches/vhffs_4.1/vhffs-compat/4.0.sql


Modified: branches/vhffs_4.1/vhffs-backend/src/pgsql/initdb.sql
===================================================================
--- branches/vhffs_4.1/vhffs-backend/src/pgsql/initdb.sql	2007-02-16 15:44:22 UTC (rev 459)
+++ branches/vhffs_4.1/vhffs-backend/src/pgsql/initdb.sql	2007-02-16 16:10:43 UTC (rev 460)
@@ -226,9 +226,9 @@
 CREATE TABLE vhffs_ml
 (
 	ml_id serial,
-	local_part varchar NOT NULL,
-	domain varchar,
-	prefix varchar,
+	local_part varchar(256) NOT NULL,
+	domain varchar(256),
+	prefix varchar(32),
 	owner_uid int4, 
 	owner_gid int4,
 	object_id int4,
@@ -245,22 +245,15 @@
 CREATE TABLE vhffs_ml_subscribers
 (
 	sub_id serial,
-	member VARCHAR NOT NULL,
+	member varchar(256) NOT NULL,
 	perm int4 NOT NULL,
 	active int4 NOT NULL,
 	hash varchar NOT NULL,
 	ml_id int4 NOT NULL,
+	language varchar(16) NOT NULL,
 	CONSTRAINT vhffs_ml_subscribers_pkey PRIMARY KEY (sub_id)
 ) WITH OIDS;
 
-CREATE TABLE vhffs_ml_lang
-(
-/* TODO use an int4 and link it to vhffs_ml_subscribers(sub_id) */
-	member VARCHAR NOT NULL,
-	lang   VARCHAR NOT NULL,
-	CONSTRAINT vhffs_ml_lang_pkey PRIMARY KEY (member)
-) WITH OIDS;
-
 CREATE TABLE vhffs_mysql
 (
 	mysql_id serial,
@@ -286,8 +279,8 @@
 (
 	pgsql_id serial,
 	dbname varchar(200) NOT NULL,
-	dbuser VARCHAR(16) NOT NULL,
-	dbpass VARCHAR(32) NOT NULL,
+	dbuser varchar(16) NOT NULL,
+	dbpass varchar(32) NOT NULL,
 	owner_uid int4, 
 	owner_gid int4,
 	object_id int4,

Modified: branches/vhffs_4.1/vhffs-compat/4.0.sql
===================================================================
--- branches/vhffs_4.1/vhffs-compat/4.0.sql	2007-02-16 15:44:22 UTC (rev 459)
+++ branches/vhffs_4.1/vhffs-compat/4.0.sql	2007-02-16 16:10:43 UTC (rev 460)
@@ -116,6 +116,12 @@
 
 -- DROP TABLE vhffs_ml_prefs
 
+-- merge vhffs_ml_lang to vhffs_ml_subscribers
+ALTER TABLE vhffs_ml_subscribers ADD COLUMN language varchar(16);
+UPDATE vhffs_ml_subscribers SET language = mll.lang FROM vhffs_ml_lang mll WHERE mll.member = vhffs_ml_subscribers.member;
+
+-- DROP TABLE vhffs_ml_lang
+
 -- update vhffs_forum view
 DROP VIEW vhffs_forum;
 CREATE VIEW vhffs_forum AS