409645 - Make Persistent Wizard: Length of Date type of Column sets to

-1

2 files changed, 13 insertions, 1 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.annotate/src/org/eclipse/jpt/jpa/annotate/mapping/JavaMapper.java b/jpa/plugins/org.eclipse.jpt.jpa.annotate/src/org/eclipse/jpt/jpa/annotate/mapping/JavaMapper.java
index 5b24f92b3d..5abad56b16 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.annotate/src/org/eclipse/jpt/jpa/annotate/mapping/JavaMapper.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.annotate/src/org/eclipse/jpt/jpa/annotate/mapping/JavaMapper.java
@@ -98,7 +98,12 @@ public class JavaMapper
 			if (col.getScale() != 0)
 				colAttrs.setScale(col.getScale());
 		}
-		else
+		else if (col.isTimeDataType()) 
+		{
+			if (col.getPrecision() != 0)
+				colAttrs.setPrecision(col.getPrecision());
+		}
+		else if (!col.isDateDataType())
 		{
 			colAttrs.setLength(col.getLength());
 		}	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.annotate/src/org/eclipse/jpt/jpa/annotate/util/AnnotateMappingUtil.java b/jpa/plugins/org.eclipse.jpt.jpa.annotate/src/org/eclipse/jpt/jpa/annotate/util/AnnotateMappingUtil.java
index faa7bd3b06..a6b0db8ea1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.annotate/src/org/eclipse/jpt/jpa/annotate/util/AnnotateMappingUtil.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.annotate/src/org/eclipse/jpt/jpa/annotate/util/AnnotateMappingUtil.java
@@ -11,6 +11,8 @@
 package org.eclipse.jpt.jpa.annotate.util;
 
 import java.math.BigDecimal;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
@@ -174,6 +176,11 @@ public class AnnotateMappingUtil
 			isAssignableFrom(type, Calendar.class.getName(), proj);
 	}
 	
+	public static boolean isTime(String type)
+	{
+		return (type.equals(Time.class.getName()) || type.equals(Timestamp.class.getName()));
+	}
+	
 	public static boolean isBoolean(String type)
 	{
 		return (type.equals(Boolean.class.getName()) || type.equals(Boolean.TYPE.getName()));