From 2dc24ced0e94c50623aab41c75e42883d68a846a Mon Sep 17 00:00:00 2001 From: Federico Caselli Date: Mon, 27 Mar 2023 22:03:44 +0200 Subject: Improve from_select typing Properly type :paramref:`_dml.Insert.from_select.names` to accept a list of string or columns or mapped attributes. Fixes: #9514 Change-Id: I2a3396454e79bd2113fc3d57d1252a2e6d141310 --- lib/sqlalchemy/sql/dml.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/sqlalchemy/sql') diff --git a/lib/sqlalchemy/sql/dml.py b/lib/sqlalchemy/sql/dml.py index dbbf09f1b..316392c0c 100644 --- a/lib/sqlalchemy/sql/dml.py +++ b/lib/sqlalchemy/sql/dml.py @@ -228,8 +228,7 @@ class DMLState(CompileState): def _process_select_values(self, statement: ValuesBase) -> None: assert statement._select_names is not None parameters: MutableMapping[_DMLColumnElement, Any] = { - coercions.expect(roles.DMLColumnRole, name, as_key=True): Null() - for name in statement._select_names + name: Null() for name in statement._select_names } if self._no_parameters: @@ -1195,7 +1194,7 @@ class Insert(ValuesBase): @_generative def from_select( self, - names: List[str], + names: Sequence[_DMLColumnArgument], select: Selectable, include_defaults: bool = True, ) -> Self: @@ -1253,7 +1252,10 @@ class Insert(ValuesBase): "This construct already inserts value expressions" ) - self._select_names = names + self._select_names = [ + coercions.expect(roles.DMLColumnRole, name, as_key=True) + for name in names + ] self._inline = True self.include_insert_from_select_defaults = include_defaults self.select = coercions.expect(roles.DMLSelectRole, select) -- cgit v1.2.1