Changeset 2662

Timestamp:

02/26/10 14:09:58 (2 years ago)

Author:

jlops

Message:

some minor name problem bugs solved

File:

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

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

@@ -99 +99 @@
                                         String mysqlDateTime = dateFormat.format(e.get${JavaName(f)}());
                                         sql.append("'"+StringEscapeUtils.escapeSql(mysqlDateTime)+"'"
+                                <#elseif f.type == "date">
+                                        sql.append("'"+new java.sql.Timestamp(new java.util.Date().getTime())+"'"
                                 <#elseif f.type == "bool">
                                         sql.append(e.get${JavaName(f)}()
@@ -164 +166 @@
                         </@compress>"); 
                 <#else>
-                        if(e.get${JavaName(f)}() != null)
-                                sql.append(<#if f.type == "bool">e.get${JavaName(f)}()<#else>"'"+StringEscapeUtils.escapeSql(e.get${JavaName(f)}().toString())+"'"</#if><#if f_has_next>+","</#if>);
-                        else
-                                sql.append("null<#if f_has_next>,</#if>");                              
+
+
+                        if(e.get${JavaName(f)}() != null) {
+                            sql.append(<@compress single_line=true>
+                                <#if f.type == "enum">
+                                        "'${f.getEnumOptions()?first}'"
+                                <#elseif f.type == "date">
+                                        "'"+new java.sql.Date(new java.util.Date().getTime())+"'"
+                                <#elseif f.type == "datetime">
+                                        "'"+new java.sql.Timestamp(new java.util.Date().getTime())+"'"
+                                <#else>
+                                    <#if f.type == "bool">e.get${JavaName(f)}()<#else>"'"+StringEscapeUtils.escapeSql(e.get${JavaName(f)}().toString())+"'"</#if>
+                                </#if>
+                            <#if f_has_next>+","</#if></@compress>);
+                        } else {
+                                sql.append("null<#if f_has_next>,</#if>");
+                        }
                 </#if>