Merge branch 'main' into fix-exception-not-foud

Author: ilyakharev

.github/workflows/publish.yml

@@ -40,9 +40,9 @@ jobs:
             PATCH=$((PATCH+1));
           fi;
           echo "<?php
-          const MAJOR = "$MAJOR";
-          const MINOR = "$MINOR";
-          const PATCH = "$PATCH";
+          const MAJOR = \"$MAJOR\";
+          const MINOR = \"$MINOR\";
+          const PATCH = \"$PATCH\";
           " >> $VERSION_FILE.tmp
           mv $VERSION_FILE.tmp $VERSION_FILE;
           git add $VERSION_FILE;

CHANGELOG.md

@@ -1,12 +1,17 @@
+## 1.9.0
+
+* added microseconds in Timestamp type
+
+## 1.8.2
 
 * fixed discovery on exception
 * fixed logger in EnvironCredentials
 
-# 1.8.1
+## 1.8.1
 
 * fixed bug, when function Retry::backoffType always return SlowBackoff
 
-# 1.8.0
+## 1.8.0
 
 * update destructor in MemorySessionPool
 * fixed exception on re-create server nodes

src/QueryResult.php

@@ -194,7 +194,13 @@ protected function fillRows($rows)
                         break;
 
                     case 'TIMESTAMP':
-                        $_row[$column['name']] = is_numeric($value) ? date('Y-m-d H:i:s', $value/1000000) : $value;
+                        if(is_numeric($value)){
+                            $value = number_format($value/1000000,6,'.','');
+                            $date = DateTime::createFromFormat('U.u', $value);
+                            $_row[$column['name']] = $date->format('Y-m-d H:i:s.u');
+                        } else {
+                            $_row[$column['name']] = $value;
+                        }
                         break;
 
                     case 'DATETIME':

src/Types/TimestampType.php

@@ -7,6 +7,10 @@
 
 class TimestampType extends DatetimeType
 {
+    /**
+     * @var string
+     */
+    protected static $datetime_format = 'Y-m-d\TH:i:s.u\Z';
 
     protected $ydb_key_name = "uint64_value";
 
@@ -25,6 +29,6 @@ protected function getYqlString()
     protected function getYdbValue()
     {
         $value = new DateTime($this->value);
-        return $value->getTimestamp() * 1000000;
+        return $value->format("U.u") * 1000000;
     }
 }

src/Version.php

@@ -1,4 +1,5 @@
 <?php
 const MAJOR = "1";
-const MINOR = "8";
-const PATCH = "1";
+const MINOR = "9";
+const PATCH = "0";
+

tests/CheckTypeTest.php

@@ -146,7 +146,8 @@ public function test(){
             "Timestamp" => [
                 "class"     => TimestampType::class,
                 "values"    => [
-                    "2023-06-14 17:12:15"
+                    "2023-06-14 17:12:15.023476", 
+                    "2023-06-14 17:12:15.000000"
                 ]
             ]
         ];