Changeset 5254

Timestamp:

05/15/07 17:45:52 (1 year ago)

Author:

bouldersprinters

Message:

boulder-oracle-sprint: It makes more sense on multiple levels to just let Oracle store (empty string) as NULL like it wants to than to try to save the empty string by storing it as some other value. This breaks a few test cases in serializers_regress, but that IMO is a matter of fixing the test cases, not the backend.

Files:

• django/branches/boulder-oracle-sprint/django/db/backends/oracle/base.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/django/db/models/fields/__init__.py (modified) (2 diffs)

django/branches/boulder-oracle-sprint/django/db/backends/oracle/base.py

@@ -467 +467 @@
-                if isinstance(value, Database.LOB):
-                    value = value.read()
-
-
-
-
+
+
+
+
+
-                    value = ''
-                # Convert 1 or 0 to True or False

django/branches/boulder-oracle-sprint/django/db/models/fields/__init__.py

@@ -77 +77 @@
-        self.maxlength, self.unique = maxlength, unique
-        self.blank, self.null = blank, null
+        # Oracle treats the empty string ('') as null, so coerce the null
+        # option whenever '' is a possible value.
+        if self.empty_strings_allowed and settings.DATABASE_ENGINE == 'oracle':
+            self.null = True
-        self.core, self.rel, self.default = core, rel, default
-        self.editable = editable
@@ -163 +167 @@
-    def get_db_prep_save(self, value):
-        "Returns field's value prepared for saving into a database."
-        # Oracle treats empty strings ('') the same as NULLs.
-        # To get around this wart, we need to change it to something else...
-        if settings.DATABASE_ENGINE == 'oracle' and value == '':
-            value = ' '
-        return value
-