ok

Author: ierusalim

README.md

@@ -10,24 +10,27 @@ and have not dependencies (may be used independently, file src/ClichHouseAPI.php
 * **setServerUrl**($url) - set ClickHouse server parameters by url (host, port, etc.)
 * **getQuery**($h_query [, $sess]) - send GET request
 * **postQuery**($h_query, $post_data [, $sess]) - send POST request
-##### Sessions:
+#### Special functions
+* **getVersion**() - return version of ClickHouse server (side effect - detect server features)
+* **isSupported**(feature-name) - true or false depending on the server support features.
+##### If isSupported('session_id'):
 * **getSession**() - get current session_id from options
 * **setSession**([$sess]) - set session_id or generate new session_id and set it
 ##### Options:
-* **setOption**($key, $value) - set http-option for requests
-* **getOption**($key) - get http-option value
+* **setOption**($key, $value) - set http-option for all next requests
+* **getOption**($key) - get current http-option value
 * **delOption**($key) - delete http-option (same ->setOption($key, null)
 
 ### Class **ClickHouseQuery**
 Class **ClickHouseQuery** contains wrapper for ClickHouseAPI and allow to easily
 send queries to ClickHouse server and parsing answering data.
 
 #### Main query-functions for use:
-* **queryTrue**($sql, [post]) - Return false only if error, otherwise return true or data
-* **queryFalse**($sql, [post])- Return false only if NOT error, otherwise string with error.
-* **queryValue**($sql, [post]) - Send query and receive data in one string (false if error)
-* **queryArray**($sql) - for queries returning multi-rows data
-* **queryKeyValues**(see descr.) - for queries returning 2 columns key => value
+* **queryFalse**($sql, [post])- for queries that should not return anything. False if ok, or error string.
+* **queryTrue**($sql, [post]) - return false only if error, otherwise return true or response data.
+* **queryValue**($sql, [post]) - send any query and receive all data in one string (false if error)
+* **queryArray**($sql) - for queries returning structured data (usually one or more table rows)
+* **queryKeyValues**(see descr.) - for queries returning 2 columns, first means as key, second as value
 * **queryInsertArray**($table, $fields_names, $fields_set) - insert data into table from array
 * **queryInsertFile**($table, $file, $structure) - insert data from file into table
 
@@ -48,7 +51,6 @@ contains functions for simple operations with ClickHouse.
 * **getDatabasesList**() - returns array contained names of existing Databases
 * **setCurrentDatabase**($db [, $sess]) - set current database by 'USE db' request
 * **getCurrentDatabase**([$sess]) - return results of 'SELECT currentDatabase()'
-* **getVersion**() - return version of ClickHouse server
 * **getUptime**() - return server uptime in seconds
 * **getSystemSettings**() - get information from system.settings as array [name=>value]
 

src/ClickHouseAPI.php

@@ -102,7 +102,7 @@ class ClickHouseAPI
     /**
      * CURL option CURLOPT_CONNECTTIMEOUT
      *
-     * @var integer 2 sec. by default
+     * @var integer 3 sec. by default
      */
     public $curl_conn_timeout = 3;
 

tests/src/ClickHouseFunctionsTest.php

@@ -110,13 +110,13 @@ public function testCreateDatabase()
 
         $tmpdb = 'tmpdbfordel';
 
-        $this->assertFalse($ch->createDatabase($tmpdb, true));
-
-        $db_arr = $ch->getDatabasesList();
+        if ($ch->isSupported('query')) {
+            $this->assertFalse($ch->createDatabase($tmpdb, true));
 
-        $this->assertTrue(array_search($tmpdb, $db_arr) !== false);
+            $db_arr = $ch->getDatabasesList();
 
-       // $this->assertFalse($ch->dropDatabase($tmpdb));
+            $this->assertTrue(array_search($tmpdb, $db_arr) !== false);
+        }
     }
 
     /**
@@ -128,11 +128,11 @@ public function testDropDatabase()
 
         $tmpdb = 'tmpdbfordel';
 
-//        $this->assertFalse($ch->createDatabase($tmpdb, true));
-
-        $this->assertFalse($ch->dropDatabase($tmpdb));
-        $db_arr = $ch->getDatabasesList();
-        $this->assertFalse(array_search($tmpdb, $db_arr));
+        if ($ch->isSupported('query')) {
+            $this->assertFalse($ch->dropDatabase($tmpdb));
+            $db_arr = $ch->getDatabasesList();
+            $this->assertFalse(array_search($tmpdb, $db_arr));
+        }
     }
 
     /**