Ticket #11984: django_bug_7383_v1.patch

contrib/admin/templatetags/admin_list.py

@@ -310 +310 @@
             }
         else:
             years = cl.query_set.dates(field_name, 'year')
-            return {
+            # this list can contain None objects so we need to remove them
+            result = {
                 'show': True,
-                'choices': [{
+                'choices': []
+            }
+            for year in years:
+                if year:
+                    result['choices'].append({
                     'link': link({year_field: year.year}),
                     'title': year.year
-                } for year in years]
-            }
+                })
+            return result
+            
 date_hierarchy = register.inclusion_tag('admin/date_hierarchy.html')(date_hierarchy)
 
 def search_form(cl):

db/backends/mysql/base.py

@@ -134 +134 @@
             sql = field_name
         else:
             format_str = ''.join([f for f in format[:i]] + [f for f in format_def[i:]])
-            sql = "CAST(DATE_FORMAT(%s, '%s') AS DATETIME)" % (field_name, format_str)
+            # do not use CAST(... as DATETIME) because it will fail if you have dates like 0000-00-00 00:00:00
+            # MySQL message: "Truncated incorrect datetime value: '0000-01-01 00:00:00'" ErrorNr: 1292
+            sql = "DATE_FORMAT(%s, '%s')" % (field_name, format_str)
         return sql
 
     def drop_foreignkey_sql(self):

db/backends/util.py

@@ -50 +50 @@
 ###############################################
 
 def typecast_date(s):
-    return s and datetime.date(*map(int, s.split('-'))) or None # returns None if s is null
+    dt = None
+    try: # this will assure that if we receive dates like '0000-00-00 00:00:00' we do not crash and return None instead
+        dt = datetime.date(*map(int, s.split('-')))
+    except:
+        dt = None
+    return dt # returns None if s is null or had another invalid value
 
 def typecast_time(s): # does NOT store time zone information
     if not s: return None
@@ -84 +89 @@
         seconds, microseconds = seconds.split('.')
     else:
         microseconds = '0'
-    return datetime.datetime(int(dates[0]), int(dates[1]), int(dates[2]),
-        int(times[0]), int(times[1]), int(seconds), int(float('.'+microseconds) * 1000000))
+    result = None
+    try: # this will assure that if we receive dates like '0000-00-00 00:00:00' we do not crash and return None instead
+        result = datetime.datetime(int(dates[0]), int(dates[1]), int(dates[2]),
+            int(times[0]), int(times[1]), int(seconds), int(float('.'+microseconds) * 1000000))
+    except:
+        result = None
+    return result
 
 def typecast_boolean(s):
     if s is None: return None