From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 15 Feb 2010 20:44:31 +0000 (+0000)
Subject:   - Removed "None" from a connection.execute() in the dialect
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e249dfd0ff2067e63b5654ca8bbd4177d97c7561;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

  - Removed "None" from a connection.execute() in the dialect
      which potentially allows pygresql to work as an alternate
      DBAPI (but this is *not supported!!!*) [ticket:1691]
---

diff --git a/CHANGES b/CHANGES
index 5fc1a5366d..af5ba4d8bc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,11 @@ CHANGES
     - Fix reflection of default values with spurious spaces
       (backport of r6257 and r6699). [ticket:1582 and ticket:1663]
 
+- postgresql
+    - Removed "None" from a connection.execute() in the dialect
+      which potentially allows pygresql to work as an alternate
+      DBAPI (but this is *not supported!!!*) [ticket:1691]
+
 0.5.8
 =====
 - sql
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 2ec820c739..de59778f3a 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -442,7 +442,7 @@ class PGDialect(default.DefaultDialect):
         return [row[0] for row in resultset]
 
     def get_default_schema_name(self, connection):
-        return connection.scalar("select current_schema()", None)
+        return connection.scalar("select current_schema()")
     get_default_schema_name = base.connection_memoize(
         ('dialect', 'default_schema_name'))(get_default_schema_name)