diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2019-10-30 18:20:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2019-10-30 18:20:06 +0000 |
| commit | 77adce762b2a9ea19fcd72a28482faf63cef4844 (patch) | |
| tree | fa784a940457be7b275ebd2fdb7c4902b7c8e050 /lib/sqlalchemy | |
| parent | 92bcb077d787ad1758e0ea0dddc478d19c75bb36 (diff) | |
| parent | 997f4b5f2b3b4725de0960824e95fcb1150ff215 (diff) | |
| download | sqlalchemy-77adce762b2a9ea19fcd72a28482faf63cef4844.tar.gz | |
Merge "Correctly interpret None passed to query.get(); warn for empty PK values"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/loading.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py index 25ba8a398..189da78bc 100644 --- a/lib/sqlalchemy/orm/loading.py +++ b/lib/sqlalchemy/orm/loading.py @@ -243,6 +243,12 @@ def load_on_pk_identity( ) _get_clause = sql_util.adapt_criterion_to_null(_get_clause, nones) + if len(nones) == len(primary_key_identity): + util.warn( + "fully NULL primary key identity cannot load any " + "object. This condition may raise an error in a future " + "release." + ) _get_clause = q._adapt_clause(_get_clause, True, False) q._criterion = _get_clause diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index d515fa83a..80d544068 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -977,7 +977,9 @@ class Query(Generative): is_dict = isinstance(primary_key_identity, dict) if not is_dict: - primary_key_identity = util.to_list(primary_key_identity) + primary_key_identity = util.to_list( + primary_key_identity, default=(None,) + ) if len(primary_key_identity) != len(mapper.primary_key): raise sa_exc.InvalidRequestError( |