diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-01-24 19:18:55 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-01-24 19:18:55 +0000 |
| commit | 20a9cd801344c689b66ff4ee9ff9b92442878f22 (patch) | |
| tree | b5ba1449dfb4a6fe6cd1ab9697cc57034baeee2e /lib/sqlalchemy/sql | |
| parent | f20102829e4280cd9c35d40e32e22729ef520b0d (diff) | |
| download | sqlalchemy-20a9cd801344c689b66ff4ee9ff9b92442878f22.tar.gz | |
not ready to put execution_options in the text()/select() constructors yet
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 26338359a..f2ad4351a 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2224,14 +2224,12 @@ class _TextClause(_Executable, ClauseElement): _hide_froms = [] def __init__(self, text = "", bind=None, - bindparams=None, typemap=None, autocommit=PARSE_AUTOCOMMIT, execution_options=None): + bindparams=None, typemap=None, + autocommit=PARSE_AUTOCOMMIT): self._bind = bind self.bindparams = {} self.typemap = typemap self._autocommit = autocommit - self._execution_options = execution_options - if self._execution_options is None: - self._execution_options = {} if typemap is not None: for key in typemap.keys(): typemap[key] = sqltypes.to_instance(typemap[key]) @@ -3193,17 +3191,13 @@ class _SelectBaseMixin(_Executable): order_by=None, group_by=None, bind=None, - autocommit=False, - execution_options=None): + autocommit=False): self.use_labels = use_labels self.for_update = for_update self._autocommit = autocommit self._limit = limit self._offset = offset self._bind = bind - self._execution_options = execution_options - if self._execution_options is None: - self._execution_options = dict() self._order_by_clause = ClauseList(*util.to_list(order_by) or []) self._group_by_clause = ClauseList(*util.to_list(group_by) or []) |