summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-02-03 19:34:29 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2016-02-03 19:34:29 -0500
commitc1316a299257fae8264c8038d83e415f4605fde7 (patch)
treea37bdd940cb7828f8efa790ffbc08c665eacd16b
parentc01d11907cbc98ddefe323c6115bc954b908f101 (diff)
downloadsqlalchemy-c1316a299257fae8264c8038d83e415f4605fde7.tar.gz
- oracle requires GLOBAL here
-rw-r--r--lib/sqlalchemy/sql/compiler.py2
-rw-r--r--lib/sqlalchemy/testing/suite/test_reflection.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index dbaa23a5d..cc9a49a91 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -53,7 +53,7 @@ LEGAL_CHARACTERS = re.compile(r'^[A-Z0-9_$]+$', re.I)
ILLEGAL_INITIAL_CHARACTERS = set([str(x) for x in range(0, 10)]).union(['$'])
BIND_PARAMS = re.compile(r'(?<![:\w\$\x5c]):([\w\$]+)(?![:\w\$])', re.UNICODE)
-BIND_PARAMS_ESC = re.compile(r'\x5c(:[\w\$]+)(?![:\w\$])', re.UNICODE)
+BIND_PARAMS_ESC = re.compile(r'\x5c(:[\w\$]*)(?![:\w\$])', re.UNICODE)
BIND_TEMPLATES = {
'pyformat': "%%(%(name)s)s",
diff --git a/lib/sqlalchemy/testing/suite/test_reflection.py b/lib/sqlalchemy/testing/suite/test_reflection.py
index 4a3dd9024..0457b2e26 100644
--- a/lib/sqlalchemy/testing/suite/test_reflection.py
+++ b/lib/sqlalchemy/testing/suite/test_reflection.py
@@ -113,7 +113,7 @@ class ComponentReflectionTest(fixtures.TablesTest):
# temp table fixture
if testing.against("oracle"):
kw = {
- 'prefixes': ["TEMPORARY"],
+ 'prefixes': ["TEMPORARY", "GLOBAL"],
'oracle_on_commit': 'PRESERVE ROWS'
}
else: