| 1 | Index: django/db/models/manipulators.py
|
|---|
| 2 | ===================================================================
|
|---|
| 3 | --- django/db/models/manipulators.py (revision 6778)
|
|---|
| 4 | +++ django/db/models/manipulators.py (working copy)
|
|---|
| 5 | @@ -189,7 +189,16 @@
|
|---|
| 6 | else:
|
|---|
| 7 | param = f.get_default()
|
|---|
| 8 | else:
|
|---|
| 9 | - param = f.get_manipulator_new_data(rel_new_data, rel=True)
|
|---|
| 10 | + if getattr(f, 'auto_now', False):
|
|---|
| 11 | + param = 'NOW()'
|
|---|
| 12 | + elif getattr(f, 'auto_now_add', False):
|
|---|
| 13 | + if old_rel_obj:
|
|---|
| 14 | + param = getattr(old_rel_obj, f.column)
|
|---|
| 15 | + else:
|
|---|
| 16 | + param = 'NOW()'
|
|---|
| 17 | + else:
|
|---|
| 18 | + param = f.get_manipulator_new_data(rel_new_data, rel=True)
|
|---|
| 19 | +
|
|---|
| 20 | if param != None:
|
|---|
| 21 | params[f.attname] = param
|
|---|
| 22 |
|
|---|