From ce0d72e68aac6ad6c7569ffe76ca5c6c02d2718c Mon Sep 17 00:00:00 2001
From: Jason Kirtland <jek@discorporate.us>
Date: Thu, 9 Aug 2007 22:10:16 +0000
Subject: Allow '$' in bind param detection [ticket:719], added test suite &
 fixed an edge case

---
 lib/sqlalchemy/ansisql.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/sqlalchemy/ansisql.py')

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',
-- 
cgit v1.2.1