diff options
author | Jason Kirtland <jek@discorporate.us> | 2007-08-09 22:10:16 +0000 |
---|---|---|
committer | Jason Kirtland <jek@discorporate.us> | 2007-08-09 22:10:16 +0000 |
commit | ce0d72e68aac6ad6c7569ffe76ca5c6c02d2718c (patch) | |
tree | 0b06377f98ec2872e19cfb7a81a27965b696bb2b /lib/sqlalchemy/ansisql.py | |
parent | 491cbf97a4e700fde69e4dfe73479173fc871c63 (diff) | |
download | sqlalchemy-ce0d72e68aac6ad6c7569ffe76ca5c6c02d2718c.tar.gz |
Allow '$' in bind param detection [ticket:719], added test suite & fixed an edge case
Diffstat (limited to 'lib/sqlalchemy/ansisql.py')
-rw-r--r-- | lib/sqlalchemy/ansisql.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py index 94d69a8ce..3d5e917cf 100644 --- a/lib/sqlalchemy/ansisql.py +++ b/lib/sqlalchemy/ansisql.py @@ -45,8 +45,8 @@ LEGAL_CHARACTERS = util.Set(string.ascii_lowercase + string.digits + '_$') ILLEGAL_INITIAL_CHARACTERS = util.Set(string.digits + '$') -BIND_PARAMS = re.compile(r'(?<![:\w\x5c]):(\w+)(?!:)', re.UNICODE) -BIND_PARAMS_ESC = re.compile(r'\x5c(:\w+)(?!:)', re.UNICODE) +BIND_PARAMS = re.compile(r'(?<![:\w\$\x5c]):([\w\$]+)(?![:\w\$])', re.UNICODE) +BIND_PARAMS_ESC = re.compile(r'\x5c(:[\w\$]+)(?![:\w\$])', re.UNICODE) OPERATORS = { operator.and_ : 'AND', |