Waldemar Kornewald  committed f79fecb

Don't call Field.default() unnecessarily. Patch contributed by Jonas Haag.

  • Participants
  • Parent commits 8aa2a83

Comments (0)

Files changed (1)

File djangotoolbox/db/

 from django.conf import settings
+from django.db.models.fields import NOT_PROVIDED
 from django.db.models.sql import aggregates as sqlaggregates
 from django.db.models.sql.compiler import SQLCompiler
 from django.db.models.sql.constants import LOOKUP_SEP, MULTI, SINGLE
     def _make_result(self, entity, fields):
         result = []
         for field in fields:
-            if not field.null and entity.get(field.column,
-                    field.get_default()) is None:
+            value = entity.get(field.column, NOT_PROVIDED)
+            if value is NOT_PROVIDED:
+                value = field.get_default()
+            if value is None and not field.null:
                 raise DatabaseError("Non-nullable field %s can't be None!" %
-            result.append(self.convert_value_from_db(field.db_type(
-                connection=self.connection), entity.get(field.column, field.get_default())))
+            value = self.convert_value_from_db(field.db_type(connection=self.connection), value)
+            result.append(value)
         return result
     def check_query(self):