Merge lp:~ack/storm/postgres-9.2-tests-fix into lp:storm

[Alberto Donato]

This fixes a test failure with Postgres>=9.2.

The "pg_stat_activity.procpid" table has been renamed to "pid".

[Benji York (benji)]

This branch looks good.

review: Approve

=== modified file 'tests/databases/postgres.py'
--- tests/databases/postgres.py	2013-09-25 22:06:34 +0000
+++ tests/databases/postgres.py	2015-06-03 16:08:49 +0000
@@ -57,11 +57,13 @@
 
 def terminate_other_backends(connection):
     """Terminate all connections to the database except the one given."""
+    pid_column = "procpid" if connection._database._version < 90200 else "pid"
     connection.execute(
-        "SELECT pg_terminate_backend(procpid)"
+        "SELECT pg_terminate_backend(%(pid_column)s)"
         "  FROM pg_stat_activity"
         " WHERE datname = current_database()"
-        "   AND procpid != pg_backend_pid()")
+        "   AND %(pid_column)s != pg_backend_pid()" %
+        {"pid_column": pid_column})
 
 
 def terminate_all_backends(database):