Changeset 2664

Timestamp:

02/26/10 15:24:50 (2 years ago)

Author:

jlops

Message:

Date releated problems solved, needs to be tested (executeAdd, excuteUpdate)

File:

• molgenis/3.3/src/org/molgenis/generators/db/MultiqueryMapperGen.java.ftl (modified) (3 diffs)

molgenis/3.3/src/org/molgenis/generators/db/MultiqueryMapperGen.java.ftl

@@ -100 +100 @@
                                         sql.append("'"+StringEscapeUtils.escapeSql(mysqlDateTime)+"'"
                                 <#elseif f.type == "date">
-                                        '"+new java.sql.Timestamp(new java.util.Date().getTime())+"'
+                                        sql.append("'"+new java.sql.Date(e.get${JavaName(f)}().getTime()).toString()+"'"
                                 <#elseif f.type == "bool">
                                         sql.append(e.get${JavaName(f)}()
@@ -157 +157 @@
                                         '${f.getEnumOptions()?first}'
                                 <#elseif f.type == "date">
-                                        '"+new java.sql.Date(new java.util.Date().getTime())+"'
+                                        "'"+new java.sql.Date(e.get${JavaName(f)}().getTime()).toString()+"'"
                                 <#elseif f.type == "datetime">
-                                        '"+new java.sql.Timestamp(new java.util.Date().getTime())+"'
+                                        "'"+new java.sql.Timestamp(e.get${JavaName(f)}().getTime()).toString()+"'"
                                 <#else>
                                         0
@@ -173 +173 @@
                                         "'${f.getEnumOptions()?first}'"
                                 <#elseif f.type == "date">
-                                        "'"+new java.sql.Date(new java.util.Date().getTime())+"'"
+                                        "'"+new java.sql.Date(e.get${JavaName(f)}().getTime()).toString()+"'"
                                 <#elseif f.type == "datetime">
-                                        "'"+new java.sql.Timestamp(new java.util.Date().getTime())+"'"
+                                        "'"+new java.sql.Timestamp(e.get${JavaName(f)}().getTime()).toString()+"'"
                                 <#else>
                                     <#if f.type == "bool">e.get${JavaName(f)}()<#else>"'"+StringEscapeUtils.escapeSql(e.get${JavaName(f)}().toString())+"'"</#if>