diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/odbc/mssql.sql | 2 | ||||
| -rw-r--r-- | src/odbc/mysql.sql | 19 | ||||
| -rw-r--r-- | src/odbc/pg.sql | 2 |
4 files changed, 17 insertions, 10 deletions
@@ -1,6 +1,10 @@ 2006-11-04 Mickael Remond <mickael.remond@process-one.net> * src/eldap_utils.erl: Fixed missing export. + + * src/odbc/pg.sql: Database scripts consistency. + * src/odbc/mysql.sql: Likewise. + * src/odbc/mssql.sql: Likewise. 2006-10-29 Mickael Remond <mickael.remond@process-one.net> diff --git a/src/odbc/mssql.sql b/src/odbc/mssql.sql index 49fcd218c..c92fa776c 100644 --- a/src/odbc/mssql.sql +++ b/src/odbc/mssql.sql @@ -104,7 +104,7 @@ CREATE TABLE [dbo].[rosterusers] ( [nick] [varchar] (50) NULL ,
[subscription] [char] (1) NOT NULL ,
[ask] [char] (1) NOT NULL ,
- [askmessage] [varchar] (250) NULL ,
+ [askmessage] [varchar] (250) NOT NULL ,
[server] [char] (1) NOT NULL ,
[subscribe] [varchar] (200) NULL ,
[type] [varchar] (50) NULL
diff --git a/src/odbc/mysql.sql b/src/odbc/mysql.sql index 8642d72a4..4288cef13 100644 --- a/src/odbc/mysql.sql +++ b/src/odbc/mysql.sql @@ -1,16 +1,17 @@ --- Needs MySQL max with innodb back-end +-- Needs MySQL (at least 4.1.x) with innodb back-end +SET table_type=InnoDB; CREATE TABLE users ( username varchar(250) PRIMARY KEY, password text NOT NULL -) TYPE=InnoDB CHARACTER SET utf8; +) CHARACTER SET utf8; CREATE TABLE last ( username varchar(250) PRIMARY KEY, seconds text NOT NULL, state text -) TYPE=InnoDB CHARACTER SET utf8; +) CHARACTER SET utf8; CREATE TABLE rosterusers ( @@ -23,7 +24,7 @@ CREATE TABLE rosterusers ( server character(1) NOT NULL, subscribe text, type text -) TYPE=InnoDB CHARACTER SET utf8; +) CHARACTER SET utf8; CREATE UNIQUE INDEX i_rosteru_user_jid USING HASH ON rosterusers(username(75), jid(75)); CREATE INDEX i_rosteru_username USING HASH ON rosterusers(username); @@ -33,7 +34,7 @@ CREATE TABLE rostergroups ( username varchar(250) NOT NULL, jid varchar(250) NOT NULL, grp text NOT NULL -) TYPE=InnoDB CHARACTER SET utf8; +) CHARACTER SET utf8; CREATE INDEX pk_rosterg_user_jid USING HASH ON rostergroups(username(75), jid(75)); @@ -42,7 +43,7 @@ CREATE TABLE spool ( username varchar(250) NOT NULL, xml text, seq SERIAL -) TYPE=InnoDB CHARACTER SET utf8; +) CHARACTER SET utf8; CREATE INDEX i_despool USING BTREE ON spool(username); @@ -50,7 +51,7 @@ CREATE INDEX i_despool USING BTREE ON spool(username); CREATE TABLE vcard ( username varchar(250) PRIMARY KEY, vcard text NOT NULL -) TYPE=InnoDB CHARACTER SET utf8; +) CHARACTER SET utf8; CREATE TABLE vcard_search ( @@ -78,7 +79,7 @@ CREATE TABLE vcard_search ( lorgname varchar(250) NOT NULL, orgunit text NOT NULL, lorgunit varchar(250) NOT NULL -) TYPE=InnoDB CHARACTER SET utf8; +) CHARACTER SET utf8; CREATE INDEX i_vcard_search_lfn ON vcard_search(lfn); CREATE INDEX i_vcard_search_lfamily ON vcard_search(lfamily); @@ -94,3 +95,5 @@ CREATE INDEX i_vcard_search_lorgunit ON vcard_search(lorgunit); --- To update from 1.x: -- ALTER TABLE rosterusers ADD COLUMN askmessage text AFTER ask; +-- UPDATE rosterusers SET askmessage = ''; +-- ALTER TABLE rosterusers ALTER COLUMN askmessage SET NOT NULL; diff --git a/src/odbc/pg.sql b/src/odbc/pg.sql index 9f88756fe..9f632d215 100644 --- a/src/odbc/pg.sql +++ b/src/odbc/pg.sql @@ -18,7 +18,7 @@ CREATE TABLE rosterusers ( nick text, subscription character(1) NOT NULL, ask character(1) NOT NULL, - askmessage text, + askmessage text NOT NULL, server character(1) NOT NULL, subscribe text, "type" text |