diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/dml.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/dml.py | 11 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/sqlite/dml.py | 11 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/base.py | 25 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/dml.py | 30 |
5 files changed, 72 insertions, 13 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/dml.py b/lib/sqlalchemy/dialects/mysql/dml.py index 9f8177c59..6c50dcca9 100644 --- a/lib/sqlalchemy/dialects/mysql/dml.py +++ b/lib/sqlalchemy/dialects/mysql/dml.py @@ -1,5 +1,6 @@ from ... import exc from ... import util +from ...sql.base import _exclusive_against from ...sql.base import _generative from ...sql.dml import Insert as StandardInsert from ...sql.elements import ClauseElement @@ -49,6 +50,13 @@ class Insert(StandardInsert): return alias(self.table, name="inserted") @_generative + @_exclusive_against( + "_post_values_clause", + msgs={ + "_post_values_clause": "This Insert construct already " + "has an ON DUPLICATE KEY clause present" + }, + ) def on_duplicate_key_update(self, *args, **kw): r""" Specifies the ON DUPLICATE KEY UPDATE clause. diff --git a/lib/sqlalchemy/dialects/postgresql/dml.py b/lib/sqlalchemy/dialects/postgresql/dml.py index 76dfafd04..bff61e173 100644 --- a/lib/sqlalchemy/dialects/postgresql/dml.py +++ b/lib/sqlalchemy/dialects/postgresql/dml.py @@ -10,6 +10,7 @@ from ... import util from ...sql import coercions from ...sql import roles from ...sql import schema +from ...sql.base import _exclusive_against from ...sql.base import _generative from ...sql.dml import Insert as StandardInsert from ...sql.elements import ClauseElement @@ -50,7 +51,16 @@ class Insert(StandardInsert): """ return alias(self.table, name="excluded").columns + _on_conflict_exclusive = _exclusive_against( + "_post_values_clause", + msgs={ + "_post_values_clause": "This Insert construct already has " + "an ON CONFLICT clause established" + }, + ) + @_generative + @_on_conflict_exclusive def on_conflict_do_update( self, constraint=None, @@ -117,6 +127,7 @@ class Insert(StandardInsert): ) @_generative + @_on_conflict_exclusive def on_conflict_do_nothing( self, constraint=None, index_elements=None, index_where=None ): diff --git a/lib/sqlalchemy/dialects/sqlite/dml.py b/lib/sqlalchemy/dialects/sqlite/dml.py index 9c8f10f7b..be32781c7 100644 --- a/lib/sqlalchemy/dialects/sqlite/dml.py +++ b/lib/sqlalchemy/dialects/sqlite/dml.py @@ -7,6 +7,7 @@ from ... import util from ...sql import coercions from ...sql import roles +from ...sql.base import _exclusive_against from ...sql.base import _generative from ...sql.dml import Insert as StandardInsert from ...sql.elements import ClauseElement @@ -46,7 +47,16 @@ class Insert(StandardInsert): """ return alias(self.table, name="excluded").columns + _on_conflict_exclusive = _exclusive_against( + "_post_values_clause", + msgs={ + "_post_values_clause": "This Insert construct already has " + "an ON CONFLICT clause established" + }, + ) + @_generative + @_on_conflict_exclusive def on_conflict_do_update( self, index_elements=None, @@ -99,6 +109,7 @@ class Insert(StandardInsert): ) @_generative + @_on_conflict_exclusive def on_conflict_do_nothing(self, index_elements=None, index_where=None): """ Specifies a DO NOTHING action for ON CONFLICT clause. diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py index 550111020..220bbb115 100644 --- a/lib/sqlalchemy/sql/base.py +++ b/lib/sqlalchemy/sql/base.py @@ -102,6 +102,31 @@ def _generative(fn): return decorated +def _exclusive_against(*names, **kw): + msgs = kw.pop("msgs", {}) + + defaults = kw.pop("defaults", {}) + + getters = [ + (name, operator.attrgetter(name), defaults.get(name, None)) + for name in names + ] + + @util.decorator + def check(fn, self, *args, **kw): + for name, getter, default_ in getters: + if getter(self) is not default_: + msg = msgs.get( + name, + "Method %s() has already been invoked on this %s construct" + % (fn.__name__, self.__class__), + ) + raise exc.InvalidRequestError(msg) + return fn(self, *args, **kw) + + return check + + def _clone(element, **kw): return element._clone() diff --git a/lib/sqlalchemy/sql/dml.py b/lib/sqlalchemy/sql/dml.py index c402de121..3f492a490 100644 --- a/lib/sqlalchemy/sql/dml.py +++ b/lib/sqlalchemy/sql/dml.py @@ -14,6 +14,7 @@ from . import coercions from . import roles from . import util as sql_util from .base import _entity_namespace_key +from .base import _exclusive_against from .base import _from_objects from .base import _generative from .base import ColumnCollection @@ -495,6 +496,15 @@ class ValuesBase(UpdateBase): self._setup_prefixes(prefixes) @_generative + @_exclusive_against( + "_select_names", + "_ordered_values", + msgs={ + "_select_names": "This construct already inserts from a SELECT", + "_ordered_values": "This statement already has ordered " + "values present", + }, + ) def values(self, *args, **kwargs): r"""Specify a fixed VALUES clause for an INSERT statement, or the SET clause for an UPDATE. @@ -607,15 +617,6 @@ class ValuesBase(UpdateBase): """ - if self._select_names: - raise exc.InvalidRequestError( - "This construct already inserts from a SELECT" - ) - elif self._ordered_values: - raise exc.ArgumentError( - "This statement already has ordered values present" - ) - if args: # positional case. this is currently expensive. we don't # yet have positional-only args so we have to check the length. @@ -699,6 +700,13 @@ class ValuesBase(UpdateBase): self._values = util.immutabledict(arg) @_generative + @_exclusive_against( + "_returning", + msgs={ + "_returning": "RETURNING is already configured on this statement" + }, + defaults={"_returning": _returning}, + ) def return_defaults(self, *cols): """Make use of a :term:`RETURNING` clause for the purpose of fetching server-side expressions and defaults. @@ -783,10 +791,6 @@ class ValuesBase(UpdateBase): :attr:`_engine.CursorResult.inserted_primary_key_rows` """ - if self._returning: - raise exc.InvalidRequestError( - "RETURNING is already configured on this statement" - ) self._return_defaults = cols or True |