Merge remote-tracking branch 'origin/add-retry-function' into add-retry-function

Author: ilyakharev

CHANGELOG.md

@@ -1,4 +1,5 @@
 * added retry function
+* added optional type in prepare statment
 
 ## 1.5.6
 

src/Traits/TypeValueHelpersTrait.php

@@ -21,6 +21,7 @@
 use YdbPlatform\Ydb\Types\DateType;
 use YdbPlatform\Ydb\Types\JsonType;
 use YdbPlatform\Ydb\Types\ListType;
+use YdbPlatform\Ydb\Types\OptionalType;
 use YdbPlatform\Ydb\Types\UintType;
 use YdbPlatform\Ydb\Types\Utf8Type;
 use YdbPlatform\Ydb\Types\Int8Type;
@@ -161,6 +162,11 @@ public function valueOfType($value, $type)
             return (new TupleType($value))->itemTypes(trim(substr($type, 6, -1)));
         }
 
+        else if (substr($_type, 0, 8) === 'OPTIONAL')
+        {
+            return (new OptionalType($value))->itemType(trim(substr($type, 9, -1)));
+        }
+
         throw new Exception('YDB: Unknown [' . $type . '] type.');
     }
 

src/Types/OptionalType.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace YdbPlatform\Ydb\Types;
+
+use Ydb\Type;
+
+class OptionalType extends AbstractType
+{
+    /**
+     * @var string
+     */
+    protected $itemType;
+
+    /**
+     * @inherit
+     */
+    protected function normalizeValue($value)
+    {
+        return $this->typeValue($value, $this->itemType)->normalizeValue($value);
+    }
+
+    /**
+     * @param string $type
+     * @return $this
+     */
+    public function itemType($type)
+    {
+        $this->itemType = $type;
+        return $this;
+    }
+
+    /**
+     * @inherit
+     */
+    public function toYdbValue()
+    {
+         return $this->typeValue($this->value, $this->itemType)->toYdbValue();
+    }
+
+    /**
+     * @inherit
+     */
+    public function getYdbType()
+    {
+        $type_id = $this->convertType($this->itemType);
+
+        if ($type_id)
+        {
+            return new Type([
+                'optional_type' => new \Ydb\OptionalType([
+                    'item' => new Type([
+                        'type_id' => $type_id,
+                    ]),
+                ]),
+            ]);
+        }
+        else
+        {
+            $value = $this->typeValue('', $this->itemType);
+            return new Type([
+                'optional_type' => new \Ydb\OptionalType([
+                    'item' => $value->getYdbType(),
+                ]),
+            ]);
+        }
+    }
+
+    /**
+     * @inherit
+     */
+    public function toYdbType()
+    {
+        return $this->getYdbType();
+    }
+
+    /**
+     * @inherit
+     */
+    protected function getYqlString()
+    {
+        $value = $this->typeValue($this->value, $this->itemType)->toYqlString();
+
+        return '(' . $value . ')';
+    }
+
+}

tests/CheckTypeTest.php

@@ -45,12 +45,6 @@ public function test(){
         ];
 
         $checkTypes = [
-            "Timestamp" => [
-                "class"     => TimestampType::class,
-                "values"    => [
-                    "2023-06-14 17:12:15.000001"
-                ]
-            ],
             "Bool"  => [
                 "class" => BoolType::class,
                 "values" => [
@@ -161,6 +155,17 @@ public function test(){
         $table = $ydb->table();
         $session = $table->createSession();
 
+        $query = "DECLARE \$v as Optional<Int32>; SELECT \$v as val;";
+        $prepared = $session->prepare($query);
+        $result = $prepared->execute([
+            'v' => null,
+        ]);
+
+        $query = "DECLARE \$v as Optional<Int32>; SELECT \$v as val;";
+        $prepared = $session->prepare($query);
+        $result = $prepared->execute([
+            'v' => 4,
+        ]);
 
         $query = "DECLARE \$v as Struct<x:Int32>; SELECT \$v as val;";
         $prepared = $session->prepare($query);
@@ -174,13 +179,6 @@ public function test(){
             'v' => [2],
         ]);
 
-//        $query = "DECLARE \$v as Optional<Int32>; SELECT \$v as val;";
-//        $prepared = $session->prepare($query);
-//        $result = $prepared->execute([
-//            'v' => 2,
-//        ]);
-//        print_r($result);
-
         foreach ($checkTypes as $type=>$data) {
             $query = "DECLARE \$v as $type; SELECT \$v as val;";
             $prepared = $session->prepare($query);