[Tikiwiki-cvs] tiki/db tiki.sql,1.214.2.85,1.214.2.86 tiki_1.8to1.9.sql,1.79.2.84,1.79.2.85

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15372/db

Modified Files:
      Tag: BRANCH-1-9
	tiki.sql tiki_1.8to1.9.sql 
Log Message:
can subscribe user and group in a newsletter. emails will be refreshed at each sending

Index: tiki.sql
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/db/tiki.sql,v
retrieving revision 1.214.2.85
retrieving revision 1.214.2.86
diff -u -d -r1.214.2.85 -r1.214.2.86
--- tiki.sql	26 Jan 2005 07:16:48 -0000	1.214.2.85
+++ tiki.sql	26 Jan 2005 20:57:43 -0000	1.214.2.86
@@ -2264,7 +2264,24 @@
   code varchar(32) default NULL,
   valid char(1) default NULL,
   subscribed int(14) default NULL,
-  PRIMARY KEY  (nlId,email)
+  isUser char(1) NOT NULL default 'n',
+  PRIMARY KEY  (nlId,email,isUser)
+) TYPE=MyISAM;
+# --------------------------------------------------------
+
+#
+# Table structure for table tiki_newsletter_groups
+#
+# Creation: Jan 18, 2005
+# Last update: Jan 18, 2005
+#
+
+DROP TABLE IF EXISTS tiki_newsletter_groups;
+CREATE TABLE tiki_newsletter_groups (
+  nlId int(12) NOT NULL default '0',
+  groupName varchar(255) NOT NULL default '',
+  code varchar(32) default NULL,
+  PRIMARY KEY  (nlId,groupName)
 ) TYPE=MyISAM;
 # --------------------------------------------------------
 

Index: tiki_1.8to1.9.sql
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/db/tiki_1.8to1.9.sql,v
retrieving revision 1.79.2.84
retrieving revision 1.79.2.85
diff -u -d -r1.79.2.84 -r1.79.2.85
--- tiki_1.8to1.9.sql	26 Jan 2005 07:16:49 -0000	1.79.2.84
+++ tiki_1.8to1.9.sql	26 Jan 2005 20:57:44 -0000	1.79.2.85
@@ -887,9 +887,20 @@
 ALTER TABLE tiki_user_tasks ADD accepted_user char(1) DEFAULT NULL AFTER accepted_creator;
 
 
-
-
 #2005-01-13 sir-b
 INSERT INTO users_permissions (permName, permDesc, level,type) VALUES ('tiki_p_tasks_send', 'Can send tasks to other users', 'registered', 'user');
 INSERT INTO users_permissions (permName, permDesc, level,type) VALUES ('tiki_p_tasks_receive', 'Can receive tasks from other users', 'registered', 'user');
 INSERT INTO users_permissions (permName, permDesc, level,type) VALUES ('tiki_p_tasks_admin', 'Can admin public tasks', 'admin', 'user');
+
+#2005-01-20 sylvieg
+CREATE TABLE tiki_newsletter_groups (
+  nlId int(12) NOT NULL default '0',
+  groupName varchar(255) NOT NULL default '',
+  code varchar(20),
+  PRIMARY KEY  (nlId,groupName)
+) TYPE=MyISAM;
+ALTER TABLE tiki_newsletter_subscriptions ADD isUser char(1) NOT NULL default 'n' AFTER subscribed;
+UPDATE tiki_newsletter_subscriptions set isUser='n';
+ALTER TABLE tiki_newsletter_subscriptions DROP PRIMARY INDEX;
+ALTER TABLE tiki_newsletter_subscriptions PRIMARY KEY  (nlId,email,isUser);
+