Change DO API to reflect absence of 'default_do_language'.

James William Pye · James William Pye · commit a6a5a51b5883 · 2010-02-02T16:04:22.000-07:00
Better this way.
diff --git a/postgresql/api.py b/postgresql/api.py
@@ -919,13 +919,10 @@ def settings(self) -> Settings:
 		"""
 
 	@abstractmethod
-	def do(source, language = None) -> None:
+	def do(language, source) -> None:
 		"""
-		Execute a DO statement using the given source. Always returns `None` and
-		raise a `postgresql.exceptions.Error` subclass on error.
-
-		If `language` is `None`, no language will be given to the DO statement,
-		allowing the default configured language to be used.
+		Execute a DO statement using the given language and source.
+		Always returns `None`.
 
 		Likely to be a function of Connection.execute.
 		"""
@@ -934,7 +931,7 @@ def do(source, language = None) -> None:
 	def execute(sql) -> None:
 		"""
 		Execute an arbitrary block of SQL. Always returns `None` and raise
-		a `postgresql.exceptions.Error` subclass on error.
+		an exception on error.
 		"""
 
 	@abstractmethod
diff --git a/postgresql/documentation/driver.txt b/postgresql/documentation/driver.txt
@@ -335,10 +335,9 @@ The methods and properties on the connection object are ready for use:
   This is used in cases where the cursor was declared on the server. See
   `Cursors`_ for more information.
 
- ``db.do(source[, language = None])``
-  Execute a DO statement on the server. If `language` is `None`, none will be
-  specified and the `default_do_language` database setting will be used by
-  PostgreSQL. *DO statements are available on PostgreSQL 8.5 and greater.*
+ ``db.do(language, source)``
+  Execute a DO statement on the server using the specified language.
+  *DO statements are available on PostgreSQL 9.0 and greater.*
   *Executing this method on servers that do not support DO statements will*
   *likely cause a SyntaxError*.
 
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -1808,11 +1808,12 @@ def execute(self, query : str) -> None:
 		self._pq_push(q, self)
 		self._pq_complete()
 
-	def do(self, source : str, language : str = None) -> None:
-		sql = "DO " + pg_str.quote_literal(source)
-		if language is not None:
-			sql = sql + " LANGUAGE " + pg_str.quote_ident(language)
-		self.execute(sql + ";")
+	def do(self, language : str, source : str,
+		qlit = pg_str.quote_literal,
+		qid = pg_str.quote_ident,
+	) -> None:
+		sql = "DO " + qlit(source) + " LANGUAGE " + qid(language) + ";"
+		self.execute(sql)
 
 	def xact(self, gid = None, isolation = None, mode = None):
 		x = Transaction(self, gid = gid, isolation = isolation, mode = mode)
