3 files changed, 9 insertions, 2 deletions
diff --git a/database/database.mysql b/database/database.mysql
index 3895fa336..78b7f5865 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -308,7 +308,8 @@ CREATE TABLE filter_formats (
   name varchar(255) NOT NULL default '',
   roles varchar(255) NOT NULL default '',
   cache tinyint(2) NOT NULL default '0',
-  PRIMARY KEY (format)
+  PRIMARY KEY (format),
+  UNIQUE KEY (name)
 )
 /*!40100 DEFAULT CHARACTER SET utf8 */ ;
 
diff --git a/database/database.pgsql b/database/database.pgsql
index a83393945..1628a4b74 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -293,7 +293,8 @@ CREATE TABLE filter_formats (
   name varchar(255) NOT NULL default '',
   roles varchar(255) NOT NULL default '',
   cache smallint NOT NULL default '0',
-  PRIMARY KEY (format)
+  PRIMARY KEY (format),
+  UNIQUE (name)
 );
 
 --
diff --git a/database/updates.inc b/database/updates.inc
index f43cf57e5..ddf3c4500 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -1669,3 +1669,8 @@ function system_update_175() {
   }
   return array();
 }
+
+function system_update_176() {
+  $ret[] = update_sql('ALTER TABLE {filter_formats} ADD UNIQUE KEY (name)');
+  return $ret;
+}