- Force names of unique constraints in PostgreSQL DDL (postgres 9.x uses different naming convention than older versions)

3 files changed, 4 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f7a12d1a3..df52c545f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Force names of unique constraints in PostgreSQL DDL
 - Add code for prevention from IMAP connection hangs when server closes socket unexpectedly
 - Remove redundant DELETE query (for old session deletion) on login
 - Get around unreliable rand() and mt_rand() in session ID generation (#1486281)
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
index b273bcb0b..5350e791f 100644
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -25,7 +25,7 @@ CREATE TABLE users (
     last_login timestamp with time zone DEFAULT NULL,
     "language" varchar(5),
     preferences text DEFAULT ''::text NOT NULL,
-    UNIQUE (username, mail_host)
+    CONSTRAINT users_username_key UNIQUE (username, mail_host)
 );
 
 CREATE INDEX users_alias_id_idx ON users (alias);
@@ -220,7 +220,7 @@ CREATE TABLE messages (
     size integer DEFAULT 0 NOT NULL,
     headers text NOT NULL,
     structure text,
-    UNIQUE (user_id, cache_key, uid)
+    CONSTRAINT messages_user_id_key UNIQUE (user_id, cache_key, uid)
 );
 
 CREATE INDEX messages_index_idx ON messages (user_id, cache_key, idx);
diff --git a/SQL/postgres.update.sql b/SQL/postgres.update.sql
index 91c32f8ec..d20b1ae2c 100644
--- a/SQL/postgres.update.sql
+++ b/SQL/postgres.update.sql
@@ -85,7 +85,7 @@ ALTER TABLE users ALTER last_login SET DEFAULT NULL;
 -- Updates from version 0.4.2
 
 DROP INDEX users_username_id_idx;
-ALTER TABLE users ADD UNIQUE (username, mail_host);
+ALTER TABLE users ADD CONSTRAINT users_username_key UNIQUE (username, mail_host);
 ALTER TABLE contacts ALTER email TYPE varchar(255);
 
 TRUNCATE messages;