Fix oracle incorrect char padding

trinodb · Apr 20, 2021 · c6111d2 · c6111d2
1 parent c682a1d
commit c6111d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleClient.java b/plugin/trino-oracle/src/main/java/io/trino/plugin/oracle/OracleClient.java
@@ -33,7 +33,6 @@
 import io.trino.spi.connector.JoinCondition;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.type.CharType;
-import io.trino.spi.type.Chars;
 import io.trino.spi.type.DecimalType;
 import io.trino.spi.type.Decimals;
 import io.trino.spi.type.Type;
@@ -306,7 +305,7 @@ else if (precision > Decimals.MAX_PRECISION || actualPrecision <= 0) {
                 return Optional.of(ColumnMapping.sliceMapping(
                         charType,
                         charReadFunction(charType),
-                        oracleCharWriteFunction(charType),
+                        oracleCharWriteFunction(),
                         FULL_PUSHDOWN));
 
             case OracleTypes.VARCHAR:
@@ -420,11 +419,10 @@ public static DoubleWriteFunction oracleDoubleWriteFunction()
         return ((statement, index, value) -> ((OraclePreparedStatement) statement).setBinaryDouble(index, value));
     }
 
-    private SliceWriteFunction oracleCharWriteFunction(CharType charType)
+    private SliceWriteFunction oracleCharWriteFunction()
     {
-        return (statement, index, value) -> {
-            statement.setString(index, Chars.padSpaces(value, charType).toStringUtf8());
-        };
+        return (statement, index, value) ->
+                ((OraclePreparedStatement) statement).setFixedCHAR(index, value.toStringUtf8());
     }
 
     @Override

diff --git a/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/AbstractTestOracleTypeMapping.java b/plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/AbstractTestOracleTypeMapping.java
@@ -366,6 +366,11 @@ public void testCharUnicodeReadMapping()
                 unicodeTests(charDataType(CHAR), codePoints(), MAX_CHAR_ON_READ),
                 unicodeTests(charDataType(BYTE), utf8Bytes(), MAX_CHAR_ON_READ),
                 unicodeTests(ncharDataType(), String::length, MAX_NCHAR));
+
+        SqlDataTypeTest.create()
+                .addRoundTrip(format("char(%d char)", MAX_CHAR_ON_READ), "'攻殻機動隊'",
+                        createCharType(MAX_CHAR_ON_READ), format("CAST('攻殻機動隊' AS char(%d))", MAX_CHAR_ON_READ))
+                .execute(getQueryRunner(), oracleCreateAndInsert("read_char_unicode"));
     }
 
     private static DataTypeTest unicodeTests(IntFunction<DataType<String>> typeConstructor, ToIntFunction<String> stringLength, int maxSize)