test: bugfix bytestring yson test

Author: zeruk

src/__tests__/bytestring-identity.test.ts

@@ -1,36 +1,19 @@
 import Driver from '../driver';
-import {
-    destroyDriver,
-    initDriver,
-    TABLE
-} from '../test-utils';
+import {destroyDriver, initDriver, TABLE} from '../test-utils';
 import {Column, Session, TableDescription} from '../table';
-import {declareType, TypedData, Types} from "../types";
-import {withRetries} from "../retries";
-
+import {declareType, TypedData, Types} from '../types';
+import {withRetries} from '../retries';
 
 async function createTable(session: Session) {
     await session.dropTable(TABLE);
     await session.createTable(
         TABLE,
         new TableDescription()
-            .withColumn(new Column(
-                'id',
-                Types.optional(Types.UINT64),
-            ))
-            .withColumn(new Column(
-                'field1',
-                Types.optional(Types.TEXT),
-            ))
-            .withColumn(new Column(
-                'field2',
-                Types.optional(Types.BYTES),
-            ))
-            .withColumn(new Column(
-                'field3',
-                Types.optional(Types.YSON),
-            ))
-            .withPrimaryKey('id')
+            .withColumn(new Column('id', Types.optional(Types.UINT64)))
+            .withColumn(new Column('field1', Types.optional(Types.TEXT)))
+            .withColumn(new Column('field2', Types.optional(Types.BYTES)))
+            .withColumn(new Column('field3', Types.optional(Types.YSON)))
+            .withPrimaryKey('id'),
     );
 }
 
@@ -65,15 +48,15 @@ class Row extends TypedData {
 
 export async function fillTableWithData(session: Session, rows: Row[]) {
     const query = `
-DECLARE $data AS List<Struct<id: Uint64, field1: String, field2: String, field3: Yson>>;
+DECLARE $data AS List<Struct<id: Uint64, field1: Text, field2: String, field3: Yson>>;
 
 REPLACE INTO ${TABLE}
 SELECT * FROM AS_TABLE($data);`;
 
     await withRetries(async () => {
         const preparedQuery = await session.prepareQuery(query);
         await session.executeQuery(preparedQuery, {
-            '$data': Row.asTypedCollection(rows),
+            $data: Row.asTypedCollection(rows),
         });
     });
 }
@@ -86,7 +69,7 @@ describe('bytestring identity', () => {
             id: 0,
             field1: 'zero',
             field2: Buffer.from('half'),
-            field3: Buffer.from('<a=1>[3;%false]')
+            field3: Buffer.from('<a=1>[3;%false]'),
         }),
     ];
 
@@ -103,8 +86,8 @@ describe('bytestring identity', () => {
         });
     });
 
-    it('Types.STRING does not keep the original string in write-read cycle', () => {
-        expect(actualRows[0].field1).not.toEqual('zero');
+    it('Types.TEXT keeps the original string in write-read cycle', () => {
+        expect(actualRows[0].field1).toEqual('zero');
     });
 
     it('Types.BYTES keeps the original string in write-read cycle', () => {

src/__tests__/types.test.ts

@@ -423,7 +423,7 @@ describe('Types', () => {
                     const data = {
                         string_value: Buffer.from('foo'),
                         utf8_value: 'hello',
-                        yson_value: Buffer.from('<a=1>[3;%false]'),
+                        yson_value: '<a=1>[3;%false]',
                         json_value: '{"a":1,"b":null}',
                         json_document_value: '[]',
                     };

src/types.ts

@@ -451,6 +451,7 @@ function objectFromValue(type: IType, value: unknown) {
     const {typeId} = type;
     switch (typeId) {
         case PrimitiveTypeId.YSON:
+            return (value as Buffer).toString('utf8');
         case PrimitiveTypeId.STRING:
             return value as Buffer;
         case PrimitiveTypeId.DATE: