Author: awhite
Date: Wed Oct 4 14:16:06 2006
New Revision: 453030
URL: http://svn.apache.org/viewvc?view=rev&rev=453030
Log:
Fix bug that could prevent user-assigned value from being inserted into a column
with a database default value.
Modified:
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java
Modified:
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java?view=diff&rev=453030&r1=453029&r2=453030
==============================================================================
---
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java
(original)
+++
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java
Wed Oct 4 14:16:06 2006
@@ -666,7 +666,8 @@
if (_action == ACTION_INSERT) {
if (col.isAutoAssigned())
return;
- if (!overrideDefault && col.getDefaultString() != null)
+ if (!overrideDefault && val == null
+ && col.getDefaultString() != null)
return;
}
if (val == null && col.isNotNull())
