Merge pull request #60 from ydb-platform/fix-prepare

Removed query id in prepare statement

Author: ilyakharev

CHANGELOG.md

@@ -1,3 +1,5 @@
+* removed query id in prepare statement
+
 ## 1.5.2
 
 * fixed refresh token when it expired

src/Session.php

@@ -68,7 +68,7 @@ class Session
     /**
      * @var bool
      */
-    protected $keep_query_in_cache = false;
+    protected $keep_query_in_cache = null;
 
     /**
      * @param Table $table
@@ -359,7 +359,7 @@ public function query($yql, array $parameters = null)
         $query = $this->newQuery($yql)
             ->parameters($parameters)
             ->txControl($tx_control)
-            ->keepInCache($this->keep_query_in_cache);
+            ->keepInCache($this->keep_query_in_cache ?? ($parameters&&count($parameters)>0));
 
         return $this->executeQuery($query);
     }
@@ -426,9 +426,7 @@ public function prepare($yql)
             'yql_text' => $yql,
         ]);
 
-        $query_id = $result->getQueryId();
-
-        $statement->saveQueryId($query_id);
+        $statement->saveInCache();
 
         return $statement;
     }

src/Statement.php

@@ -21,11 +21,6 @@ class Statement
      */
     protected $yql;
 
-    /**
-     * @var string
-     */
-    protected $query_id;
-
     /**
      * @var string
      */
@@ -67,7 +62,7 @@ public function __construct(Session $session, $yql)
     public function execute(array $parameters = [])
     {
         $q = new Query([
-            'id' => $this->query_id,
+            'yql_text' => $this->yql,
         ]);
 
         return $this->session->query($q, $this->prepareParameters($parameters));
@@ -81,23 +76,6 @@ public function isCached()
         return $this->cached;
     }
 
-    /**
-     * @return string
-     */
-    public function getQueryId()
-    {
-        return $this->query_id;
-    }
-
-    /**
-     * @param string $query_id
-     */
-    public function saveQueryId($query_id)
-    {
-        $this->query_id = $query_id;
-        static::$qcache[$this->qhash] = $this->query_id;
-    }
-
     /**
      * @param array $parameters
      * @return array
@@ -132,9 +110,8 @@ protected function prepareParameters($parameters)
      */
     protected function checkQueryCache()
     {
-        $this->qhash = sha1($this->session->id() . '~' . trim($this->yql));
-        $this->query_id = static::$qcache[$this->qhash] ?? null;
-        if ($this->query_id)
+        $this->qhash = sha1(trim($this->yql));
+        if (in_array($this->qhash, static::$qcache))
         {
             $this->cached = true;
         }
@@ -154,4 +131,8 @@ protected function detectParams()
             }
         }
     }
+
+    public function saveInCache(){
+        static::$qcache[$this->qhash] = $this->qhash;
+    }
 }

tests/PreparedQueryTest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace YdbPlatform\Ydb\Test;
+
+use PHPUnit\Framework\TestCase;
+use YdbPlatform\Ydb\Auth\Implement\AnonymousAuthentication;
+use YdbPlatform\Ydb\Ydb;
+
+class PreparedQueryTest extends TestCase
+{
+    public function test(){
+        $config = [
+
+            // Database path
+            'database'    => '/local',
+
+            // Database endpoint
+            'endpoint'    => 'localhost:2136',
+
+            // Auto discovery (dedicated server only)
+            'discovery'   => false,
+
+            // IAM config
+            'iam_config'  => [
+                'insecure' => true,
+            ],
+            'credentials' => new AnonymousAuthentication()
+        ];
+        $ydb = new Ydb($config);
+        $table = $ydb->table();
+
+        $session = $table->createSession();
+
+        $prepared_query = $session->prepare('
+declare $pk as Int64;
+select $pk;');
+        $x = 2;
+        $result = $session->transaction(function($session) use ($prepared_query, $x){
+            return $prepared_query->execute([
+                'pk' => $x,
+            ]);
+        });
+        self::assertEquals($x,
+            $result->rows()[0]['column0']
+        );
+    }
+}

tests/RefreshTokenTest.php

@@ -70,7 +70,7 @@ public function test(){
         ];
         $ydb = new Ydb($config);
         $table = $ydb->table();
-        $session = $table->session();
+        $session = $table->createSession();
         $token = MetaGetter::getMeta($session)["x-ydb-auth-ticket"][0];
         self::assertEquals(
             1,

tests/RetryOnBadSessionTest.php

@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use YdbPlatform\Ydb\Auth\Implement\AnonymousAuthentication;
+use YdbPlatform\Ydb\Table;
 use YdbPlatform\Ydb\Ydb;
 
 class SessionManager extends \YdbPlatform\Ydb\Session{
@@ -39,14 +40,15 @@ public function test(){
         ];
         $ydb = new Ydb($config);
         $table = $ydb->table();
-        $session = $table->session();
+        $session = $table->createSession();
         $oldSessionId = SessionManager::getSessionId($session);
         $session->delete();
-        $session = $table->session();
+        $session = $table->createSession();
         SessionManager::setSessionId($session,$oldSessionId);
+        $tres = $session->query('select 1 as res')->rows()[0]['res'];
         self::assertEquals(
             1,
-            $session->query('select 1 as res')->rows()[0]['res']
+            $tres
         );
     }
 }

tests/RunTest.php

@@ -38,7 +38,7 @@ private function getYdbResult(array $config) : array
         $ydb = new Ydb($config);
         $table = $ydb->table();
 
-        $session = $table->session();
+        $session = $table->createSession();
 
         $session->createTable(
             'episodes',