Merge branch 'main' into keep-in-cache

Author: ilyakharev

CHANGELOG.md

@@ -1,4 +1,5 @@
 * fix keepInCache param in YdbQuery
+* added Yson type
 * add logger as Ydb config
 * added snapshot mode in noninteractive transaction
 

src/QueryResult.php

@@ -192,6 +192,7 @@ protected function fillRows($rows)
                 }
                 switch ($column['type'])
                 {
+                    case 'YSON':
                     case 'STRING':
                         $_row[$column['name']] = base64_decode($value);
                         break;

src/Traits/TypeValueHelpersTrait.php

@@ -39,6 +39,7 @@
 use YdbPlatform\Ydb\Types\DatetimeType;
 use YdbPlatform\Ydb\Types\TimestampType;
 use YdbPlatform\Ydb\Contracts\TypeContract;
+use YdbPlatform\Ydb\Types\YsonType;
 
 trait TypeValueHelpersTrait
 {
@@ -142,7 +143,7 @@ public function valueOfType($value, $type)
             case 'STRING': return new StringType($value);
             case 'TEXT':
             case 'UTF8': return new Utf8Type($value);
-            // case 'YSON': return new StringValue(); // not implemented
+            case 'YSON': return new YsonType($value); // not implemented
             case 'JSON': return new JsonType($value);
             case 'UUID': return new StringType($value);
         }

src/Types/YsonType.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace YdbPlatform\Ydb\Types;
+
+class YsonType extends AbstractType
+{
+    /**
+     * @inherit
+     */
+    protected $ydb_key_name = 'bytes_value';
+
+    /**
+     * @inherit
+     */
+    protected $ydb_type = 'Yson';
+
+    /**
+     * @inherit
+     */
+    protected function getYqlString()
+    {
+        return 'Yson(@@' . $this->value . '@@)';
+    }
+}

tests/CheckTypeTest.php

@@ -45,6 +45,12 @@ public function testCheckTypesInDeclare(){
         ];
 
         $checkTypes = [
+            "Yson"  => [
+                "class"     => YsonType::class,
+                "values"    => [
+                    "<a=b>c"
+                ]
+            ],
             "Bool"  => [
                 "class" => BoolType::class,
                 "values" => [