Merge pull request #134 from ilyakharev/main

Added `ScanQueryMode` for `Table::scanQuery`

Author: rekby

CHANGELOG.md

@@ -1,3 +1,5 @@
+* added `ScanQueryMode` for `Table::scanQuery`
+
 ## 1.13.2
 ### Bugs
 

protos/Ydb/Table/ExecuteScanQueryRequest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace YdbPlatform\Ydb\Enums;
+
+use UnexpectedValueException;
+use Ydb\Table\ExecuteScanQueryRequest\Mode;
+
+class ScanQueryMode
+{
+    const MODE_UNSPECIFIED = Mode::MODE_UNSPECIFIED;
+    const MODE_EXPLAIN = Mode::MODE_EXPLAIN;
+    const MODE_EXEC = Mode::MODE_EXEC;
+    private static $valueToName = [
+        self::MODE_UNSPECIFIED => 'MODE_UNSPECIFIED',
+        self::MODE_EXPLAIN => 'MODE_EXPLAIN',
+        self::MODE_EXEC => 'MODE_EXEC',
+    ];
+
+    public static function name($value)
+    {
+        if (!isset(self::$valueToName[$value])) {
+            throw new UnexpectedValueException(sprintf(
+                'Enum %s has no name defined for value %s', __CLASS__, $value));
+        }
+        return self::$valueToName[$value];
+    }
+
+
+    public static function value($name)
+    {
+        $const = __CLASS__ . '::' . strtoupper($name);
+        if (!defined($const)) {
+            throw new UnexpectedValueException(sprintf(
+                'Enum %s has no value defined for name %s', __CLASS__, $name));
+        }
+        return constant($const);
+    }
+}

src/Enums/ScanQueryMode.php

@@ -8,6 +8,7 @@
 use Ydb\Table\Query;
 use Ydb\Table\V1\TableServiceClient as ServiceClient;
 use YdbPlatform\Ydb\Contracts\SessionPoolContract;
+use YdbPlatform\Ydb\Enums\ScanQueryMode;
 use YdbPlatform\Ydb\Exceptions\Grpc\InvalidArgumentException;
 use YdbPlatform\Ydb\Exceptions\Grpc\UnknownException;
 use YdbPlatform\Ydb\Exceptions\NonRetryableException;
@@ -395,14 +396,22 @@ public function describeTable($table)
 
     /**
      * @param string $yql
+     * @param array $parameters
+     * @param int $mode
      * @return \Generator
+     * @throws Exception
      */
-    public function scanQuery($yql)
+    public function scanQuery($yql, $parameters = [], $mode = ScanQueryMode::MODE_EXEC)
     {
+        if($parameters != []){
+            throw new Exception("Not implemented");
+        }
+
         $q = new Query(['yql_text' => $yql]);
 
         return $this->streamRequest('StreamExecuteScanQuery', [
             'query' => $q,
+            'mode'  => $mode
         ]);
     }
 

src/Table.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace YdbPlatform\Ydb\Test;
+
+use PHPUnit\Framework\TestCase;
+use YdbPlatform\Ydb\Auth\Implement\AnonymousAuthentication;
+use YdbPlatform\Ydb\Enums\ScanQueryMode;
+use YdbPlatform\Ydb\Ydb;
+use YdbPlatform\Ydb\YdbTable;
+
+class ScanQueryTest extends TestCase
+{
+
+    function testScanQuery()
+    {
+
+        $config = [
+
+            // Database path
+            'database' => '/local',
+
+            // Database endpoint
+            'endpoint' => 'localhost:2136',
+
+            // Auto discovery (dedicated server only)
+            'discovery' => true,
+
+            // IAM config
+            'iam_config' => [
+                'insecure' => true,
+            ],
+
+            'credentials' => new AnonymousAuthentication()
+        ];
+        $ydb = new Ydb($config, new \YdbPlatform\Ydb\Logger\SimpleStdLogger(7));
+        $table = $ydb->table();
+
+        $table->retrySession(function (\YdbPlatform\Ydb\Session $session){
+            $session->createTable(
+                'scan_table',
+                YdbTable::make()
+                    ->addColumn('id', 'UINT64')
+                    ->primaryKey('id')
+            );
+        }, true);
+
+        $yql = 'SELECT id
+FROM scan_table
+WHERE id = 1;';
+
+        $scanWithOutMode = $table->scanQuery($yql);
+        $scanWithExplainMode = $table->scanQuery($yql, [], ScanQueryMode::MODE_EXPLAIN);
+        $scanWithExecMode = $table->scanQuery($yql, [], ScanQueryMode::MODE_EXEC);
+
+        // These `foreach` needs for requests
+        foreach ($scanWithOutMode as $value){}
+        foreach ($scanWithExplainMode as $value){}
+        foreach ($scanWithExecMode as $value){}
+
+        self::expectExceptionMessage("Not implemented");
+        $scanWithParams = $table->scanQuery($yql, ["value"=>"some"]);
+        foreach ($scanWithParams as $value){}
+    }
+}