diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2022-04-04 10:13:23 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2022-04-07 10:47:53 -0400 |
commit | 2acc9ec1281b2818bd44804f040d94ec46215688 (patch) | |
tree | 40e77ef66a8682b4a1d885575412a78152806397 /lib/sqlalchemy/sql/base.py | |
parent | 3b4d62f4f72e8dfad7f38db192a6a90a8551608c (diff) | |
download | sqlalchemy-2acc9ec1281b2818bd44804f040d94ec46215688.tar.gz |
cx_Oracle modernize
Full "RETURNING" support is implemented for the cx_Oracle dialect, meaning
multiple RETURNING rows are now recived for DML statements that produce
more than one row for RETURNING.
cx_Oracle 7 is now the minimum version for cx_Oracle.
Getting Oracle to do multirow returning took about 5 minutes. however,
getting Oracle's RETURNING system to integrate with ORM-enabled
insert, update, delete, is a big deal because that architecture wasn't
really working very robustly, including some recent changes in 1.4
for FromStatement were done in a hurry, so this patch also cleans up
the FromStatement situation and begins to establish it more concretely
as the base for all ReturnsRows / TextClause ORM scenarios.
Fixes: #6245
Change-Id: I2b4e6007affa51ce311d2d5baa3917f356ab961f
Diffstat (limited to 'lib/sqlalchemy/sql/base.py')
-rw-r--r-- | lib/sqlalchemy/sql/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py index 6b25d8fcd..f766a5ac5 100644 --- a/lib/sqlalchemy/sql/base.py +++ b/lib/sqlalchemy/sql/base.py @@ -937,7 +937,7 @@ class Executable(roles.StatementRole, Generative): _with_context_options: Tuple[ Tuple[Callable[[CompileState], None], Any], ... ] = () - _compile_options: Optional[CacheableOptions] + _compile_options: Optional[Union[Type[CacheableOptions], CacheableOptions]] _executable_traverse_internals = [ ("_with_options", InternalTraversal.dp_executable_options), @@ -982,7 +982,7 @@ class Executable(roles.StatementRole, Generative): ) -> Result: ... - @util.non_memoized_property + @util.ro_non_memoized_property def _all_selected_columns(self): raise NotImplementedError() |