增加jdbcType和javaType

zhou-hao · zhou-hao · commit eb2d835b24b0 · 2016-12-01T14:58:52.000+08:00
diff --git a/hsweb-web-controller/src/main/java/org/hsweb/web/controller/system/DatabaseManagerController.java b/hsweb-web-controller/src/main/java/org/hsweb/web/controller/system/DatabaseManagerController.java
@@ -62,7 +62,7 @@ public ResponseMessage showTables(boolean reload) throws SQLException {
         }
         return ok(cached)
                 .include(RDBTableMetaData.class, "name", "alias", "comment", "columns")
-                .include(RDBColumnMetaData.class, "name", "alias", "comment", "dataType", "notNull", "primaryKey", "properties")
+                .include(RDBColumnMetaData.class, "name", "alias", "comment", "dataType","jdbcType", "javaType", "notNull", "primaryKey", "properties")
                 .onlyData();
     }
 
@@ -98,7 +98,7 @@ public ResponseMessage showTables(@PathVariable("dataSourceId") String dataSourc
             }
             return ok(cached)
                     .include(RDBTableMetaData.class, "name", "alias", "comment", "columns")
-                    .include(RDBColumnMetaData.class, "name", "alias", "comment", "dataType", "notNull", "primaryKey", "properties")
+                    .include(RDBColumnMetaData.class, "name", "alias", "comment", "jdbcType", "javaType", "dataType", "notNull", "primaryKey", "properties")
                     .onlyData();
         } finally {
             DynamicDataSource.useDefault(false);

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public ResponseMessage showTables(boolean reload) throws SQLException {`
`62`	`62`	`}`
`63`	`63`	`return ok(cached)`
`64`	`64`	`.include(RDBTableMetaData.class, "name", "alias", "comment", "columns")`
`65`		`- .include(RDBColumnMetaData.class, "name", "alias", "comment", "dataType", "notNull", "primaryKey", "properties")`
	`65`	`+ .include(RDBColumnMetaData.class, "name", "alias", "comment", "dataType","jdbcType", "javaType", "notNull", "primaryKey", "properties")`
`66`	`66`	`.onlyData();`
`67`	`67`	`}`
`68`	`68`
`@@ -98,7 +98,7 @@ public ResponseMessage showTables(@PathVariable("dataSourceId") String dataSourc`
`98`	`98`	`}`
`99`	`99`	`return ok(cached)`
`100`	`100`	`.include(RDBTableMetaData.class, "name", "alias", "comment", "columns")`
`101`		`- .include(RDBColumnMetaData.class, "name", "alias", "comment", "dataType", "notNull", "primaryKey", "properties")`
	`101`	`+ .include(RDBColumnMetaData.class, "name", "alias", "comment", "jdbcType", "javaType", "dataType", "notNull", "primaryKey", "properties")`
`102`	`102`	`.onlyData();`
`103`	`103`	`} finally {`
`104`	`104`	`DynamicDataSource.useDefault(false);`