Select the appropriate startup_data symbol.

James William Pye · James William Pye · commit 6237af3e37e8 · 2010-02-07T12:31:44.000-07:00
8.0 and earliar didn't have a backend_start.
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -1903,9 +1903,7 @@ def connect(self):
 			self._raise_pq_error()
 			# gah, the fatality of the connection does not
 			# appear to exist...
-			raise RuntimeError(
-				"closed connection has no fatal error"
-			)
+			raise RuntimeError("closed connection has no fatal error")
 
 		self.pq = None
 		# if any exception occurs past this point, the connection
@@ -1925,13 +1923,13 @@ def connect(self):
 		# When ssl is True: SSL negotiation will occur *and* it must succeed.
 		# When ssl is False: SSL negotiation will occur but it may fail(NOSSL).
 		if sslmode == 'allow':
-			# first, without ssl, then with. :)
+			# without ssl, then with. :)
 			socket_factories = interlace(
 				zip(repeat(None, len(socket_factories)), socket_factories),
 				zip(repeat(True, len(socket_factories)), socket_factories)
 			)
 		elif sslmode == 'prefer':
-			# first, with ssl, then without. [maybe] :)
+			# with ssl, then without. [maybe] :)
 			socket_factories = interlace(
 				zip(repeat(False, len(socket_factories)), socket_factories),
 				zip(repeat(None, len(socket_factories)), socket_factories)
@@ -1952,25 +1950,27 @@ def connect(self):
 		# in these cases, can_skip is set to True so that the
 		# subsequent non-ssl attempt is skipped if it failed with the 'N' response.
 		can_skip = False
+		startup = self.connector._startup_parameters
+		password = self.connector._password
+		Connection3 = client.Connection
 		for (ssl, sf) in socket_factories:
 			if can_skip is True:
 				# the last attempt failed and knows this attempt will fail too.
 				can_skip = False
 				continue
-			pq = client.Connection(
-				sf, self.connector._startup_parameters,
-				password = self.connector._password,
-			)
+			pq = Connection3(sf, startup, password = password,)
 			if hasattr(self, 'tracer'):
 				pq.tracer = self.tracer
+
 			# Grab the negotiation transaction before
 			# connecting as it will be needed later if successful.
 			neg = pq.xact
 			pq.connect(ssl = ssl, timeout = timeout)
 
 			didssl = getattr(pq, 'ssl_negotiation', -1)
 
-			# It successfully connected if pq.xact is None.
+			# It successfully connected if pq.xact is None;
+			# The startup/negotiation xact completed.
 			if pq.xact is None:
 				self.pq = pq
 				self.security = 'ssl' if didssl is True else None
@@ -2019,30 +2019,25 @@ def connect(self):
 			# it's over.
 			raise could_not_connect_err
 		##
-		# connected, now initialize metadata
-		# Use the version_info and integer_datetimes setting to identify
-		# the necessary binary type i/o functions to use.
+		# connected, now initialize connection information.
 		self.backend_id = self.pq.backend_id
 
 		sv = self.settings.cache.get("server_version", "0.0")
 		self.version_info = pg_version.normalize(pg_version.split(sv))
 		# manual binding
 		self.sys = pg_lib.Binding(self, pg_lib.sys)
 
-		# Get the *full* version string.
-		self.version = self.prepare("SELECT pg_catalog.version()").first()
+		if self.version_info <= (8,0):
+			meth = self.sys.startup_data_no_start
+		else:
+			meth = self.sys.startup_data
+		# connection info
+		self.version, self.backend_start, \
+		self.client_address, self.client_port = meth()
+
 		# First word from the version string.
 		self.type = self.version.split()[0]
 
-		r = self.sys.activity_for(self.backend_id)
-		if r is not None:
-			# conditional initialization of client_address.
-			# pythons without ipaddr will likely give strings.
-			ca = r.get('client_addr')
-			if ca is not None:
-				self.client_address = ca.split('/')[0]
-			self.client_port = r.get('client_port')
-			self.backend_start = r.get('backend_start')
 		##
 		# Set standard_conforming_strings
 		scstr = self.settings.get('standard_conforming_strings')
diff --git a/postgresql/lib/__init__.py b/postgresql/lib/__init__.py
@@ -61,6 +61,9 @@ class Symbol(Element):
 	)
 	_e_label = 'SYMBOL'
 	_e_factors = ('library', 'source',)
+
+	# The statement execution methods; symbols allow this to be specified
+	# in order for a default method to be selected.
 	execution_methods = {
 		'first',
 		'rows',
@@ -96,6 +99,8 @@ def __str__(self):
 		"""
 		Provide the source of the query's symbol.
 		"""
+		# Explicitly run str() on source as it is expected that a
+		# given symbol's source may be generated.
 		return str(self.source)
 
 class Library(Element):
@@ -145,6 +150,7 @@ class SymbolCollection(Library):
 		'preload',
 		'const',
 		'proc',
+		'transient',
 	)
 
 	def __init__(self, symbols, preface = None):
@@ -356,7 +362,9 @@ def __getattr__(self, name):
 					r = list(r)
 				bs = s[name] = r
 			else:
-				bs = s[name] = BoundSymbol(sym, db)
+				bs = BoundSymbol(sym, db)
+				if sym.type != 'transient':
+					s[name] = bs
 		return bs
 
 class Category(pg_api.Category):
diff --git a/postgresql/lib/libsys.sql b/postgresql/lib/libsys.sql
@@ -114,24 +114,33 @@ SELECT
 FROM
 	pg_catalog.generate_series(1, array_upper(($1::text[][]), 1)) g(i)
 
-[activity]
-SELECT client_addr, client_port, backend_start::text FROM pg_catalog.pg_stat_activity
+[startup_data:transient:first]
+SELECT
+ pg_catalog.version()::text,
+ backend_start::text,
+ client_addr::text,
+ client_port
+FROM pg_catalog.pg_stat_activity WHERE procpid = pg_catalog.pg_backend_pid();
 
-[activity_for::first]
-*[activity]
- WHERE procpid = $1
+[startup_data_no_start:transient:first]
+SELECT
+ pg_catalog.version()::text,
+ NULL::text AS backend_start,
+ client_addr::text,
+ client_port
+FROM pg_catalog.pg_stat_activity WHERE procpid = pg_catalog.pg_backend_pid();
 
-[sizeof_db::first]
+[sizeof_db:transient:first]
 SELECT pg_catalog.pg_database_size(current_database())::bigint
 
-[sizeof_cluster::first]
+[sizeof_cluster:transient:first]
 SELECT SUM(pg_catalog.pg_database_size(datname))::bigint FROM pg_database
 
 [sizeof_relation::first]
 SELECT pg_catalog.pg_relation_size($1::text)::bigint
 
-[pg_reload_conf]
+[pg_reload_conf:transient:]
 SELECT pg_reload_conf()
 
-[languages::column]
+[languages:transient:column]
 SELECT lanname FROM pg_catalog.pg_language
