diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-11-09 23:52:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-11-09 23:52:28 +0000 |
| commit | 863a048790c99c0e70abe438744f9858fd6806cb (patch) | |
| tree | 0cfbd1a325aa689c07cf1d6efc9902f7acb5fe07 /lib/sqlalchemy/sql/compiler.py | |
| parent | 0c6071513fea9d183dc67979a239dff746992571 (diff) | |
| parent | b919a0a85afd5066f9188b20ef06ee1b4af884a9 (diff) | |
| download | sqlalchemy-863a048790c99c0e70abe438744f9858fd6806cb.tar.gz | |
Merge "change the POSTCOMPILE/ SCHEMA symbols to not conflict w mssql quoting" into main
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 646b49f22..6611cd55f 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -1247,7 +1247,7 @@ class SQLCompiler(Compiled): return expr statement = re.sub( - r"\[POSTCOMPILE_(\S+?)(~~.+?~~)?\]", + r"__\[POSTCOMPILE_(\S+?)(~~.+?~~)?\]", process_expanding, self.string, ) @@ -2374,9 +2374,9 @@ class SQLCompiler(Compiled): # for postcompile w/ expanding, move the "wrapped" part # of this into the inside m = re.match( - r"^(.*)\(\[POSTCOMPILE_(\S+?)\]\)(.*)$", wrapped + r"^(.*)\(__\[POSTCOMPILE_(\S+?)\]\)(.*)$", wrapped ) - wrapped = "([POSTCOMPILE_%s~~%s~~REPL~~%s~~])" % ( + wrapped = "(__[POSTCOMPILE_%s~~%s~~REPL~~%s~~])" % ( m.group(2), m.group(1), m.group(3), @@ -2582,7 +2582,7 @@ class SQLCompiler(Compiled): self.escaped_bind_names = {} self.escaped_bind_names[escaped_from] = name if post_compile: - return "[POSTCOMPILE_%s]" % name + return "__[POSTCOMPILE_%s]" % name else: return self.bindtemplate % {"name": name} @@ -5037,7 +5037,7 @@ class IdentifierPreparer(object): "in schema translate name '%s'" % name ) return quoted_name( - "[SCHEMA_%s]" % (name or "_none"), quote=False + "__[SCHEMA_%s]" % (name or "_none"), quote=False ) else: return obj.schema @@ -5063,7 +5063,7 @@ class IdentifierPreparer(object): ) return self.quote_schema(effective_schema) - return re.sub(r"(\[SCHEMA_([^\]]+)\])", replace, statement) + return re.sub(r"(__\[SCHEMA_([^\]]+)\])", replace, statement) def _escape_identifier(self, value): """Escape an identifier. |