From 099f6be796e196f72578545151bc401d06ef1c08 Mon Sep 17 00:00:00 2001 From: mdb Date: Fri, 25 Apr 2008 18:32:44 +0000 Subject: [PATCH] git-svn-id: https://samskivert.googlecode.com/svn/trunk@2296 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/jdbc/depot/DepotMarshaller.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java index 1395dd7f..6fcf694d 100644 --- a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java +++ b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java @@ -702,8 +702,8 @@ public class DepotMarshaller // TIMESTAMP columns a value of "0000-00-00 00:00:00" regardless of whether we // explicitly provide a "DEFAULT" value for the column or not, and DATETIME columns // cannot accept CURRENT_TIME or NOW() defaults at all. - if (coldef.getType().equalsIgnoreCase("timestamp") || - coldef.getType().equalsIgnoreCase("datetime")) { + if (!coldef.isNullable() && (coldef.getType().equalsIgnoreCase("timestamp") || + coldef.getType().equalsIgnoreCase("datetime"))) { log.info("Assigning current time to " + fmarsh.getColumnName() + "."); ctx.invoke(new Modifier.Simple() { protected String createQuery (DatabaseLiaison liaison) {