--- a/pgsql/update_tables_0.5.x-0.6-dovecot-1.2.x.pgsql	Sun Apr 15 12:54:16 2012 +0000
+++ b/pgsql/update_tables_0.5.x-0.6-dovecot-1.2.x.pgsql	Sun Apr 15 15:30:16 2012 +0000
@@ -179,7 +179,7 @@
 -- ---
 -- Quota/Service/Transport inheritance
 -- ---
-ALTER TABLE users ALTER COLUMN tid DROP NULL;
+ALTER TABLE users ALTER COLUMN tid DROP NOT NULL;
 ALTER TABLE users ALTER COLUMN tid SET DEFAULT NULL;
 -- The qid and ssid columns have already been defined accordingly above.
 -- The rest of the logic will take place in the functions.

--- a/pgsql/update_tables_0.5.x-0.6.pgsql	Sun Apr 15 12:54:16 2012 +0000
+++ b/pgsql/update_tables_0.5.x-0.6.pgsql	Sun Apr 15 15:30:16 2012 +0000
@@ -147,7 +147,7 @@
 -- ---
 -- Quota/Service/Transport inheritance
 -- ---
-ALTER TABLE users ALTER COLUMN tid DROP NULL;
+ALTER TABLE users ALTER COLUMN tid DROP NOT NULL;
 ALTER TABLE users ALTER COLUMN tid SET DEFAULT NULL;
 -- The qid and ssid columns have already been defined accordingly above.
 -- The rest of the logic will take place in the functions.