From: Ansgar Burchardt <ansgar@debian.org>
Date: Sun, 21 Jul 2013 21:49:56 +0000 (+0200)
Subject: daklib/dbconn.py: allow use with SQLAlchemy 0.8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=296062672294509b2e3d581f4e49df429c80decc;p=dak

daklib/dbconn.py: allow use with SQLAlchemy 0.8
---

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index a90ad102..c6c8e5a1 100644
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -110,11 +110,11 @@ class DebVersion(UserDefinedType):
         return None
 
 sa_major_version = sqlalchemy.__version__[0:3]
-if sa_major_version in ["0.5", "0.6", "0.7"]:
+if sa_major_version in ["0.5", "0.6", "0.7", "0.8"]:
     from sqlalchemy.databases import postgres
     postgres.ischema_names['debversion'] = DebVersion
 else:
-    raise Exception("dak only ported to SQLA versions 0.5 to 0.7.  See daklib/dbconn.py")
+    raise Exception("dak only ported to SQLA versions 0.5 to 0.8.  See daklib/dbconn.py")
 
 ################################################################################
 
@@ -2903,7 +2903,7 @@ class DBConn(object):
             engine_args['pool_size'] = int(cnf['DB::PoolSize'])
         if cnf.has_key('DB::MaxOverflow'):
             engine_args['max_overflow'] = int(cnf['DB::MaxOverflow'])
-        if sa_major_version in ('0.6', '0.7') and cnf.has_key('DB::Unicode') and \
+        if sa_major_version != '0.5' and cnf.has_key('DB::Unicode') and \
             cnf['DB::Unicode'] == 'false':
             engine_args['use_native_unicode'] = False