Merge branch '5.0/pg-attachments-index-primary-key' into 5.0-trunk

etc/upgrade/5.0.6/indexes

@@ -0,0 +1,19 @@
+use strict;
+use warnings;
+
+if ( RT->Config->Get('DatabaseType') eq 'Pg' ) {
+    my $fulltext = RT->Config->Get('FullTextSearch');
+    if ( my $table = $fulltext->{Table} ) {
+        my $handle = RT->DatabaseHandle;
+        if ( my $indexes = { $handle->Indexes }->{ lc $table } ) {
+            if ( !grep { $_ eq lc "${table}_pkey" } @$indexes ) {
+                my $res = $handle->dbh->do("ALTER TABLE IF EXISTS $table ADD PRIMARY KEY(id)");
+                if ( !$res ) {
+                    RT->Logger->error("Could not add PRIMARY KEY to table $table");
+                }
+            }
+        }
+    }
+}
+
+1;

sbin/rt-setup-fulltext-index.in

@@ -327,7 +327,8 @@ elsif ( $DB{'type'} eq 'Pg' ) {
         push @schema, split /;\n+/, <<SCHEMA;
 CREATE TABLE $table (
     id BIGSERIAL,
-    $column tsvector
+    $column tsvector,
+    PRIMARY KEY (id)
 );
 GRANT SELECT, INSERT, UPDATE, DELETE ON $table TO "$DB{user}"
 SCHEMA