diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-05-21 18:18:39 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-05-22 10:30:38 -0400 |
| commit | 5b2abf4d269b0c58bbec90ce0b16830e6e048a17 (patch) | |
| tree | ef70ef91f0a891acd0f29397763008ff3d296b42 /lib/sqlalchemy/engine/default.py | |
| parent | d45657a2f5b880dc22dda2d1eb1687af5234a470 (diff) | |
| download | sqlalchemy-5b2abf4d269b0c58bbec90ce0b16830e6e048a17.tar.gz | |
Structural / performance refinements
* state connection schema_translate_map entirely in terms of
execution options, support for per-execution options as well
* use slots for role impls, remove superclass of the roles
themselves as this is not needed
* tighten loop in resolve, might become a C function
Change-Id: Ib98ac9b65022fbf976e49c6060e4c37573528c5f
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index 094ab3d55..52651aa2d 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -499,34 +499,10 @@ class DefaultDialect(interfaces.Dialect): if not branch: self._set_connection_isolation(connection, isolation_level) - if "schema_translate_map" in opts: - engine._schema_translate_map = map_ = opts["schema_translate_map"] - - @event.listens_for(engine, "engine_connect") - def set_schema_translate_map(connection, branch): - connection._schema_translate_map = map_ - def set_connection_execution_options(self, connection, opts): if "isolation_level" in opts: self._set_connection_isolation(connection, opts["isolation_level"]) - if "schema_translate_map" in opts: - connection._schema_translate_map = opts["schema_translate_map"] - - def set_exec_execution_options(self, connection, opts): - if "isolation_level" in opts: - raise exc.InvalidRequestError( - "The 'isolation_level' execution " - "option is not supported at the per-statement level" - ) - self._set_connection_isolation(connection, opts["isolation_level"]) - - if "schema_translate_map" in opts: - raise exc.InvalidRequestError( - "The 'schema_translate_map' execution " - "option is not supported at the per-statement level" - ) - def _set_connection_isolation(self, connection, level): if connection.in_transaction(): if connection._is_future: @@ -765,9 +741,13 @@ class DefaultExecutionContext(interfaces.ExecutionContext): self.unicode_statement = util.text_type(compiled) if compiled.schema_translate_map: + schema_translate_map = self.execution_options.get( + "schema_translate_map", {} + ) + rst = compiled.preparer._render_schema_translates self.unicode_statement = rst( - self.unicode_statement, connection._schema_translate_map + self.unicode_statement, schema_translate_map ) if not dialect.supports_unicode_statements: @@ -894,9 +874,12 @@ class DefaultExecutionContext(interfaces.ExecutionContext): positiontup = self.compiled.positiontup if compiled.schema_translate_map: + schema_translate_map = self.execution_options.get( + "schema_translate_map", {} + ) rst = compiled.preparer._render_schema_translates self.unicode_statement = rst( - self.unicode_statement, connection._schema_translate_map + self.unicode_statement, schema_translate_map ) # final self.unicode_statement is now assigned, encode if needed |