diff --git a/ChangeLog b/ChangeLog
index c9d20ee52..35a0de36e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-28  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/odbc/mysql.sql: Added some missing NOT NULL restrictions
+	* src/odbc/mssql.sql: Likewise
+	* src/odbc/pg.sql: Likewise
+
 2007-09-27  Christophe Romain  <christophe.romain@process-one.net>
 
 	* src/ejabberdctl.template: apply rootdir patch from Badlop (EJAB-385)
diff --git a/src/odbc/mssql.sql b/src/odbc/mssql.sql
index 4bed2ed32..7783476ba 100644
--- a/src/odbc/mssql.sql
+++ b/src/odbc/mssql.sql
@@ -118,7 +118,7 @@ GO
 CREATE TABLE [dbo].[spool] (
 	[id] [numeric](19, 0) IDENTITY (1, 1) NOT NULL ,
 	[username] [varchar] (250) NOT NULL ,
-	[xml] [text] NULL ,
+	[xml] [text] NOT NULL ,
 	[notifyprocessed] [bit] NULL ,
 	[created] [datetime] NULL ,
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
diff --git a/src/odbc/mysql.sql b/src/odbc/mysql.sql
index 5ba85a723..20c53b577 100644
--- a/src/odbc/mysql.sql
+++ b/src/odbc/mysql.sql
@@ -20,9 +20,9 @@ CREATE TABLE rosterusers (
     nick text NOT NULL,
     subscription character(1) NOT NULL,
     ask character(1) NOT NULL,
-    askmessage text,
+    askmessage text NOT NULL,
     server character(1) NOT NULL,
-    subscribe text,
+    subscribe text NOT NULL,
     type text
 ) CHARACTER SET utf8;
 
@@ -41,7 +41,7 @@ CREATE INDEX pk_rosterg_user_jid ON rostergroups(username(75), jid(75));
 
 CREATE TABLE spool (
     username varchar(250) NOT NULL,
-    xml text,
+    xml text NOT NULL,
     seq BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE
 ) CHARACTER SET utf8;
 
diff --git a/src/odbc/pg.sql b/src/odbc/pg.sql
index 46411818a..1fd81645d 100644
--- a/src/odbc/pg.sql
+++ b/src/odbc/pg.sql
@@ -40,7 +40,7 @@ CREATE INDEX pk_rosterg_user_jid ON rostergroups USING btree (username, jid);
 
 CREATE TABLE spool (
     username text NOT NULL,
-    xml text,
+    xml text NOT NULL,
     seq SERIAL
 );