Handle unix_socket_directories GUC change in PostgreSQL 9.3

Elvis Pranskevichus · Elvis Pranskevichus · commit 6ef6e1d2df9f · 2014-05-13T18:29:12.000-04:00
PostgreSQL replaced unix_socket_directory GUC with
unix_socket_directories.  Handle that in places where this GUC is used.
diff --git a/postgresql/temporal.py b/postgresql/temporal.py
@@ -137,8 +137,17 @@ def init(self,
 			listen_addresses = 'localhost',
 			log_destination = 'stderr',
 			log_min_messages = 'FATAL',
-			unix_socket_directory = cluster.data_directory,
 		))
+
+		if installation.version_info[:2] < (9, 3):
+			cluster.settings.update(dict(
+				unix_socket_directory = cluster.data_directory,
+			))
+		else:
+			cluster.settings.update(dict(
+				unix_socket_directories = cluster.data_directory,
+			))
+
 		cluster.settings.update(dict(
 			max_prepared_transactions = '10',
 		))
diff --git a/postgresql/test/test_cluster.py b/postgresql/test/test_cluster.py
@@ -29,11 +29,17 @@ def start_cluster(self, logfile = None):
 
 	def init(self, *args, **kw):
 		self.cluster.init(*args, **kw)
+
+		if self.cluster.installation.version_info[:2] >= (9, 3):
+			usd = 'unix_socket_directories'
+		else:
+			usd = 'unix_socket_directory'
+
 		self.cluster.settings.update({
 			'max_connections' : '8',
 			'listen_addresses' : 'localhost',
 			'port' : '6543',
-			'unix_socket_directory' : self.cluster.data_directory,
+			usd : self.cluster.data_directory,
 		})
 
 	def testSilentMode(self):
diff --git a/postgresql/test/test_connect.py b/postgresql/test/test_connect.py
@@ -86,8 +86,17 @@ def configure_cluster(self):
 			listen_addresses = listen_addresses,
 			log_destination = 'stderr',
 			log_min_messages = 'FATAL',
-			unix_socket_directory = self.cluster.data_directory,
 		))
+
+		if self.cluster.installation.version_info[:2] < (9, 3):
+			self.cluster.settings.update(dict(
+				unix_socket_directory = self.cluster.data_directory,
+			))
+		else:
+			self.cluster.settings.update(dict(
+				unix_socket_directories = self.cluster.data_directory,
+			))
+
 		# 8.4 turns prepared transactions off by default.
 		if self.cluster.installation.version_info >= (8,1):
 			self.cluster.settings.update(dict(
