You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2019/07/09 07:54:13 UTC
[empire-db] branch master updated: EMPIREDB-290: codegen bugfix
This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new 3ef94ce EMPIREDB-290: codegen bugfix
3ef94ce is described below
commit 3ef94ce6602afdc82c26ff4d2db507716e51327d
Author: Rainer Döbele <do...@apache.org>
AuthorDate: Tue Jul 9 09:54:08 2019 +0200
EMPIREDB-290: codegen bugfix
---
.../main/java/org/apache/empire/db/codegen/WriterService.java | 10 ++++++----
empire-db-codegen/src/main/resources/templates/Table.vm | 5 +++++
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/WriterService.java b/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/WriterService.java
index c619e22..38a1507 100644
--- a/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/WriterService.java
+++ b/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/WriterService.java
@@ -232,7 +232,6 @@ public class WriterService {
case VARCHAR:
return String.class;
case DATE:
- return Date.class;
case DATETIME:
return Date.class;
case CHAR:
@@ -273,10 +272,13 @@ public class WriterService {
Object val = dbC.getDefaultValue();
if (val == null)
{
- return "null";
+ return null;
}
-
- return "\"" + val + "\"";
+ if (val instanceof Number)
+ {
+ return String.valueOf(val);
+ }
+ return "\"" + String.valueOf(val) + "\"";
}
diff --git a/empire-db-codegen/src/main/resources/templates/Table.vm b/empire-db-codegen/src/main/resources/templates/Table.vm
index 1193fe8..e554024 100644
--- a/empire-db-codegen/src/main/resources/templates/Table.vm
+++ b/empire-db-codegen/src/main/resources/templates/Table.vm
@@ -42,9 +42,14 @@ public class $parser.getTableClassName($table.name) extends ${baseTableClassName
// create columns
#foreach ($col in $table.columns)
+#if($parser.getDefaultValue($col))
${parser.getColumnName($col)} = addColumn("${col.name}", DataType.${parser.getDataType($col)}, ${col.size}, ${col.isRequired()}, ${parser.getDefaultValue($col)});
+#else
+ ${parser.getColumnName($col)} = addColumn("${col.name}", DataType.${parser.getDataType($col)}, ${col.size}, ${col.isRequired()});
+#end
#end
+
// configure key columns (primary key)
#if($table.keyColumns.size()>0)
#if($table.keyColumns.size()==1)