diff options
| author | Sergey Fedoseev <fedoseev.sergey@gmail.com> | 2017-08-01 17:05:32 +0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-08-01 08:05:32 -0400 |
| commit | 62dee1483da44f7593544ea20149326e5926ab9b (patch) | |
| tree | e76c66e2c566ce8b3ad0679a8ec67d8a7bb65bae | |
| parent | 58da81a5a372a69f0bac801c412b57f3cce5f188 (diff) | |
Refs #28370 -- Moved db converters deprecation warning to improve performance.
| -rw-r--r-- | django/db/models/sql/compiler.py | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 980f6ee79f..2abfd2c289 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -1,4 +1,5 @@ import collections +import functools import re import warnings from itertools import chain @@ -921,7 +922,20 @@ class SQLCompiler: backend_converters = self.connection.ops.get_db_converters(expression) field_converters = expression.get_db_converters(self.connection) if backend_converters or field_converters: - converters[i] = (backend_converters + field_converters, expression) + convs = [] + for conv in (backend_converters + field_converters): + if func_supports_parameter(conv, 'context'): + warnings.warn( + 'Remove the context parameter from %s.%s(). Support for it ' + 'will be removed in Django 3.0.' % ( + conv.__self__.__class__.__name__, + conv.__name__, + ), + RemovedInDjango30Warning, + ) + conv = functools.partial(conv, context={}) + convs.append(conv) + converters[i] = (convs, expression) return converters def apply_converters(self, row, converters): @@ -929,18 +943,7 @@ class SQLCompiler: for pos, (convs, expression) in converters.items(): value = row[pos] for converter in convs: - if func_supports_parameter(converter, 'context'): - warnings.warn( - 'Remove the context parameter from %s.%s(). Support for it ' - 'will be removed in Django 3.0.' % ( - converter.__self__.__class__.__name__, - converter.__name__, - ), - RemovedInDjango30Warning, - ) - value = converter(value, expression, self.connection, {}) - else: - value = converter(value, expression, self.connection) + value = converter(value, expression, self.connection) row[pos] = value return tuple(row) |