diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-12-09 23:27:04 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-12-09 23:27:04 +0000 |
| commit | 5cdb942791b9aeb63d02680c712d1afc104606b0 (patch) | |
| tree | b4a0d319063136e299bf4a01399febc767c10186 /lib/sqlalchemy/sql/compiler.py | |
| parent | 7cbfbba9496fc41c21390aad8d8731c45fbacbce (diff) | |
| download | sqlalchemy-5cdb942791b9aeb63d02680c712d1afc104606b0.tar.gz | |
- Query.select_from() now replaces all existing FROM criterion with
the given argument; the previous behavior of constructing a list
of FROM clauses was generally not useful as is required
filter() calls to create join criterion, and new tables introduced
within filter() already add themselves to the FROM clause. The
new behavior allows not just joins from the main table, but select
statements as well. Filter criterion, order bys, eager load
clauses will be "aliased" against the given statement.
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 3af8f97ca..30b4089d3 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -36,7 +36,7 @@ ILLEGAL_INITIAL_CHARACTERS = re.compile(r'[0-9$]') BIND_PARAMS = re.compile(r'(?<![:\w\$\x5c]):([\w\$]+)(?![:\w\$])', re.UNICODE) BIND_PARAMS_ESC = re.compile(r'\x5c(:[\w\$]+)(?![:\w\$])', re.UNICODE) -ANONYMOUS_LABEL = re.compile(r'{ANON (-?\d+) (.*)}') +ANONYMOUS_LABEL = re.compile(r'{ANON (-?\d+) (.*?)}') BIND_TEMPLATES = { 'pyformat':"%%(%(name)s)s", |