refactor: 优化oracle varchar2类型

Signed-off-by: zhouhao <[email protected]>

Author: zhou-hao

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleDialect.java

@@ -18,7 +18,7 @@ public OracleDialect() {
         super();
         addDataTypeBuilder(JDBCType.CHAR, (meta) -> StringUtils.concat("char(", meta.getLength(), ")"));
         addDataTypeBuilder(JDBCType.NCHAR, (meta) -> StringUtils.concat("nchar(", meta.getLength(), ")"));
-        addDataTypeBuilder(JDBCType.VARCHAR, (meta) -> StringUtils.concat("varchar2(", meta.getLength(), ")"));
+        addDataTypeBuilder(JDBCType.VARCHAR, (meta) -> StringUtils.concat("varchar2(", meta.getLength(), " char)"));
         addDataTypeBuilder(JDBCType.NVARCHAR, (meta) -> StringUtils.concat("nvarchar2(", meta.getLength(), ")"));
         addDataTypeBuilder(JDBCType.TIMESTAMP, (meta) -> "timestamp");
         addDataTypeBuilder(JDBCType.TIME, (meta) -> "timestamp");
@@ -50,7 +50,7 @@ public OracleDialect() {
         registerDataType("longvarchar", DataType.builder(JdbcDataType.of(JDBCType.LONGVARCHAR, String.class), c -> "clob"));
 
         registerDataType("varchar2", DataType.builder(DataType.jdbc(JDBCType.VARCHAR, String.class),
-                                                      column -> "varchar2(" + column.getLength() + ")"));
+                                                      column -> "varchar2(" + column.getLength() + "  char)"));
 
         registerDataType("nvarchar2", DataType.builder(DataType.jdbc(JDBCType.VARCHAR, String.class),
                                                        column -> "nvarchar2(" + column.getLength() + ")"));

hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleTableMetaParserTest.java

@@ -136,7 +136,7 @@ public void testParse() {
 
                 Assert.assertNotNull(column);
 
-                Assert.assertEquals(column.getDataType(), "varchar2(32)");
+                Assert.assertEquals(column.getDataType(), "varchar2(32 char)");
                 Assert.assertEquals(column.getType().getSqlType(), JDBCType.VARCHAR);
                 Assert.assertEquals(column.getJavaType(), String.class);
                 Assert.assertTrue(column.isNotNull());
@@ -150,7 +150,7 @@ public void testParse() {
 
                 Assert.assertNotNull(column);
 
-                Assert.assertEquals(column.getDataType(), "varchar2(128)");
+                Assert.assertEquals(column.getDataType(), "varchar2(128 char)");
                 Assert.assertEquals(column.getLength(), 128);
                 Assert.assertEquals(column.getType().getSqlType(), JDBCType.VARCHAR);
                 Assert.assertEquals(column.getJavaType(), String.class);