fixes

Author: ierusalim

src/ClickHouseAPI.php

@@ -334,7 +334,7 @@ public function doQuery(
         }
 
         // If need session, check this feature
-        if(!empty($this->options['session_id'])) {
+        if (!empty($this->options['session_id'])) {
             if (isset($this->support_fe['session_id'])) {
                 $sess_sup = $this->support_fe['session_id'];
             } else {
@@ -542,7 +542,7 @@ public function getVersion($re_check = false)
             $session_id = $this->getSession();
             $query = 'SELECT version()';
             $ans = $this->doApiCall($this->server_url, compact('query', 'session_id'));
-            if($ans['code'] == 200) {
+            if ($ans['code'] == 200) {
                 $this->support_fe['session_id'] = true;
             } else {
                 // if session_id unsupported send request again
@@ -551,7 +551,9 @@ public function getVersion($re_check = false)
                 $ans = $this->doApiCall($this->server_url, compact('query'));
             }
             $ver = explode("\n", $ans['response']);
-            $this->server_version = (count($ver) == 2) ? $ver[0] : "Unknown";
+            $ver = (count($ver) == 2 && strlen($ver[0]) < 32) ? $ver[0] : "Unknown";
+            $this->support_fe['query'] = \is_string($ver) && (\count(\explode(".", $ver)) > 2);
+            $this->server_version = $ver;
             $this->setSession($old_sess);
         }
         return $this->server_version;

tests/src/ClickHouseAPITest.php

@@ -135,7 +135,7 @@ public function testDoQuery()
         $this->assertEquals(\trim($ans['response']), 22);
 
         $session_id = $ch->getSession();
-        if($ch->isSupported('session_id')) {
+        if ($ch->isSupported('session_id')) {
             $this->assertEquals(32, strlen($session_id));
         } else {
             $this->assertNull($session_id);
@@ -160,6 +160,13 @@ public function testDoQuery()
             // but last last_used_session_id must be sess_tmp
             $this->assertEquals($sess_tmp, $ch->last_used_session_id);
         }
+
+        // check query if not supported session
+        $ch->support_fe['session_id'] = false;
+        $ch->setOption('session_id', 'test');
+        $ans = $ch->doQuery("SELECT 321");
+        $this->assertEquals(\trim($ans['response']), 321);
+        $this->assertNull($ch->getSession());
     }