merge from HEAD

Author: Richard Jones

roundup/backends/back_postgresql.py

@@ -90,7 +90,6 @@ class Database(rdbms_common.Database):
     arg = '%s'
 
     def sql_open_connection(self):
-        raise NotImplementedError, "Please don't use me just yet..."
         db = getattr(self.config, 'POSTGRESQL_DATABASE')
         try:
             conn = psycopg.connect(**db)
@@ -160,6 +159,11 @@ def fix_version_2_tables(self):
             c.execute('CREATE INDEX %ss_key_idx ON %ss(%s_key)'%(name, name,
                 name))
 
+    def fix_version_3_tables(self):
+        rdbms_common.Database.fix_version_3_tables(self)
+        self.cursor.execute('''CREATE INDEX words_both_idx ON public.__words
+            USING btree (_word, _textid)''')
+
     def add_actor_column(self):
         # update existing tables to have the new actor column
         tables = self.database_schema['tables']