From c80705c1dde65586507bff338b8ef1aa5a577c23 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Thu, 17 Feb 2011 12:07:04 +0100 Subject: [PATCH] Fixed a bug with Table() constructors --- CHANGES | 2 ++ flaskext/sqlalchemy.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index de36fd01..331c95ad 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,8 @@ release. Version 0.11 ```````````` +- Fixed a bug introduced in 0.10 with alternative table constructors. + Version 0.10 ```````````` diff --git a/flaskext/sqlalchemy.py b/flaskext/sqlalchemy.py index 7d4da3ec..69d12f89 100644 --- a/flaskext/sqlalchemy.py +++ b/flaskext/sqlalchemy.py @@ -54,7 +54,7 @@ def _create_scoped_session(db, options): def _make_table(db): def _make_table(*args, **kwargs): if len(args) > 1 and isinstance(args[1], db.Column): - args = (args[0], db.metadata) + args[2:] + args = (args[0], db.metadata) + args[1:] return sqlalchemy.Table(*args, **kwargs) return _make_table