FIX: Explicitly specify mapping mode (legacy vs recommended) for YqlT…

…ypeTest
ydb-platform · Aug 9, 2024 · 1401369 · 1401369
1 parent 175f18f
commit 1401369
Show file tree

Hide file tree

Showing 2 changed files with 507 additions and 3 deletions.
diff --git a/...h/ydb/yoj/repository/ydb/YqlTypeTest.java → ...yoj/repository/ydb/YqlTypeLegacyTest.java b/...h/ydb/yoj/repository/ydb/YqlTypeTest.java → ...yoj/repository/ydb/YqlTypeLegacyTest.java
@@ -7,6 +7,7 @@
 import org.junit.Test;
 import tech.ydb.proto.ValueProtos;
 import tech.ydb.yoj.databind.DbType;
+import tech.ydb.yoj.databind.FieldValueType;
 import tech.ydb.yoj.databind.schema.Column;
 import tech.ydb.yoj.databind.schema.GlobalIndex;
 import tech.ydb.yoj.databind.schema.ObjectSchema;
@@ -27,9 +28,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public class YqlTypeTest {
+public class YqlTypeLegacyTest {
     static {
         CommonConverters.defineJsonConverter(JacksonJsonConverter.getDefault());
+        YqlPrimitiveType.useLegacyMappingFor(FieldValueType.values());
     }
 
     @Test
@@ -179,7 +181,7 @@ public void testBasicMappingAndId() {
                         ValueProtos.Type.PrimitiveTypeId.STRING,
                         ValueProtos.Type.PrimitiveTypeId.STRING,
                         ValueProtos.Type.PrimitiveTypeId.UTF8,
-                        ValueProtos.Type.PrimitiveTypeId.UTF8,
+                        ValueProtos.Type.PrimitiveTypeId.STRING,
                         ValueProtos.Type.PrimitiveTypeId.STRING,
                         ValueProtos.Type.PrimitiveTypeId.UTF8,
                         // columns
@@ -189,7 +191,7 @@ public void testBasicMappingAndId() {
                         ValueProtos.Type.PrimitiveTypeId.STRING,
                         ValueProtos.Type.PrimitiveTypeId.STRING,
                         ValueProtos.Type.PrimitiveTypeId.UTF8,
-                        ValueProtos.Type.PrimitiveTypeId.UTF8,
+                        ValueProtos.Type.PrimitiveTypeId.STRING,
                         ValueProtos.Type.PrimitiveTypeId.STRING,
                         ValueProtos.Type.PrimitiveTypeId.UTF8),
                 schema.flattenFields().stream()