Postgres 9.2 compatibility: propid got renamed to pid

Author: elprans

postgresql/driver/pq3.py

@@ -2494,6 +2494,8 @@ def _establish(self):
 		vi = self.version_info[:2]
 		if vi <= (8,1):
 			sd = self.sys.startup_data_only_version()
+		elif vi >= (9,2):
+			sd = self.sys.startup_data_92()
 		else:
 			sd = self.sys.startup_data()
 		# connection info

postgresql/lib/libsys.sql

@@ -173,6 +173,21 @@ UNION ALL SELECT
  NULL::int AS client_port
 LIMIT 1;
 
+[startup_data_92:transient:first]
+-- 9.2 and greater
+SELECT
+ pg_catalog.version()::text AS version,
+ backend_start::text,
+ client_addr::text,
+ client_port::int
+FROM pg_catalog.pg_stat_activity WHERE pid = pg_catalog.pg_backend_pid()
+UNION ALL SELECT
+ pg_catalog.version()::text AS version,
+ NULL::text AS backend_start,
+ NULL::text AS client_addr,
+ NULL::int AS client_port
+LIMIT 1;
+
 [startup_data_no_start:transient:first]
 -- 8.1 only, but is unused as often the backend's activity row is not
 -- immediately present.
@@ -200,6 +215,15 @@ FROM
 WHERE
 	procpid != pg_catalog.pg_backend_pid()
 
+[terminate_backends_92:transient:column]
+-- Terminate all except mine. 9.2 and later
+SELECT
+	pid, pg_catalog.pg_terminate_backend(pid)
+FROM
+	pg_catalog.pg_stat_activity
+WHERE
+	pid != pg_catalog.pg_backend_pid()
+
 [cancel_backends:transient:column]
 -- Cancel all except mine.
 SELECT
@@ -209,6 +233,15 @@ FROM
 WHERE
 	procpid != pg_catalog.pg_backend_pid()
 
+[cancel_backends_92:transient:column]
+-- Cancel all except mine. 9.2 and later
+SELECT
+	pid, pg_catalog.pg_cancel_backend(pid)
+FROM
+	pg_catalog.pg_stat_activity
+WHERE
+	pid != pg_catalog.pg_backend_pid()
+
 [sizeof_db:transient:first]
 SELECT pg_catalog.pg_database_size(current_database())::bigint
 

postgresql/temporal.py

@@ -65,7 +65,10 @@ def destroy(self):
 			try:
 				c = cluster.connection(user = 'test', database = 'template1',)
 				with c:
-					c.sys.terminate_backends()
+					if c.version_info[:2] <= (9,1):
+						c.sys.terminate_backends()
+					else:
+						c.sys.terminate_backends_92()
 			except Exception:
 				# Doesn't matter much if it fails.
 				pass

postgresql/test/test_driver.py

@@ -1742,7 +1742,10 @@ def testBadFD(self):
 	@pg_tmp
 	def testAdminTerminated(self):
 		with new() as killer:
-			killer.sys.terminate_backends()
+			if killer.version_info[:2] <= (9,1):
+				killer.sys.terminate_backends()
+			else:
+				killer.sys.terminate_backends_92()
 
 		self.assertRaises(
 			pg_exc.AdminShutdownError,