r810@lightspeed: robert | 2006-01-10 11:49:18 +1100

 Added check for __version__ to determine if pyscopg is v1 or v2

diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 7cfcb8382f5a605770918234ccdc993810d85e72..6b1dbef465c0cf3f59578f5230fefa7f43252076 100644 (file)
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -118,10 +118,16 @@ class PGSQLEngine(ansisql.ANSISQLEngine):
         else:
             self.module = module
         # figure psycopg version 1 or 2    
-        if self.module.__name__.endswith('psycopg2'):
-            self.version = 2
-        else:
-            self.version = 1
+       try:
+           if self.module.__version__.startswith('2'):
+               self.version = 2
+           else:
+               self.version = 1
+       except:
+           if self.module.__name__.endswith('psycopg2'):
+               self.version = 2
+           else:
+               self.version = 1
         self.opts = opts or {}
         ansisql.ANSISQLEngine.__init__(self, **params)