Fix #1663 on 0.5.x: the whitespace after DEFAULT may start with a newline

diff --git a/CHANGES b/CHANGES
index 0068cc20b4805f9a9a7dc52c0c27a5a1b46c9101..98063d9c1b8e36d096338b96ed608738f5ac8144 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,7 +8,7 @@ CHANGES
 =====
 - firebird
     - Fix reflection of default values with spurious spaces
-      (backport of r6257). [ticket:1582]
+      (backport of r6257 and r6699). [ticket:1582 and ticket:1663]
 
 0.5.8
 =====

diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index 32dc211b6dd2e008f19d0107fc3661216060747c..200c6c3b0c919bec09a0d1ae9e7d554c59ab22aa 100644 (file)
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -498,9 +498,10 @@ class FBDialect(default.DefaultDialect):
             # does it have a default value?
             if row['fdefault'] is not None:
                 # the value comes down as "DEFAULT 'value'": there may be
-                # more than one space around the "DEFAULT" keyword
+                # more than one whitespace around the "DEFAULT" keyword
+                # (see also http://tracker.firebirdsql.org/browse/CORE-356)
                 defexpr = row['fdefault'].lstrip()
-                assert defexpr.startswith('DEFAULT '), "Unrecognized default value: %s" % defexpr
+                assert defexpr[:8].rstrip()=='DEFAULT', "Unrecognized default value: %s" % defexpr
                 defvalue = defexpr[8:].strip()
                 if defvalue != 'NULL':
                     args.append(schema.DefaultClause(sql.text(defvalue)))