ALTER TABLE twig_news_prefs ADD inline int;
ALTER TABLE twig_contacts ADD type int;
ALTER TABLE twig_contacts ADD userpers int;
ALTER TABLE twig_mail_prefs ADD dreturn int;
ALTER TABLE twig_mail_prefs ADD fromaddress varchar(128);
ALTER TABLE twig_schedule ADD recurtype INT;
ALTER TABLE twig_schedule ADD recurid INT;

UPDATE twig_schedule SET recurtype=0 WHERE recurtype!=1;

CREATE TABLE twig_contacts_lists_entries (
	listid		int DEFAULT '0' NOT NULL,
	type		int DEFAULT '0' NOT NULL,
	item		int DEFAULT '0' NOT NULL,
	subitem		int
);

CREATE INDEX twig_contacts_lists_entries_listid_index ON twig_contacts_lists_entries (listid);
CREATE INDEX twig_contacts_lists_entries_item_index ON twig_contacts_lists_entries (item);

CREATE TABLE twig_schedule_recurring (
	id		NUMERIC IDENTITY PRIMARY KEY,
	schid		INT,
	recurtype	INT not null,
	schedule	INT,
	cycle		INT,
	position	INT,
	days		VARCHAR (13),
	endtype		INT not null,
	end		DATETIME not null
	)

CREATE INDEX twig_schedule_recurring_id_index ON twig_schedule_recurring (id);
CREATE INDEX twig_schedule_recurring_schid_index ON twig_schedule_recurring (schid);
CREATE INDEX twig_schedule_recurring_recurtype_index ON twig_schedule_recurring (recurtype);
CREATE INDEX twig_schedule_recurring_endtype_index ON twig_schedule_recurring (endtype);
CREATE INDEX twig_schedule_recurring_end_index ON twig_schedule_recurring (end);

ALTER TABLE twig_announce CHANGE date thedate TIMESTAMP;

ALTER TABLE twig_acls CHANGE [identity] ident varchar(128) NOT NULL;