ok

Author: ierusalim

src/ClickHouseAPI.php

@@ -44,7 +44,15 @@
  */
 class ClickHouseAPI
 {
+    /*
+     * Trait for async requests
+     */
     use ClickHouseSlots;
+    /*
+     * Trait for currentDatabase() and setCurrentDatabase();
+     */
+    use ClickHouseSessions;
+
     /**
      * Protocol for access to ClickHouse server
      *
@@ -185,13 +193,6 @@ class ClickHouseAPI
      */
     public $hook_before_api_call = false;
 
-    /**
-     * Auto-create session_id and send it with each request
-     *
-     * @var boolean
-     */
-    public $session_autocreate = false;
-
     /**
      * True if running under windows, false otherwise
      *
@@ -423,7 +424,7 @@ public function doQuery(
         $password = $this->pass;
 
         // Set session if need
-        if (!empty($session_id) && $this->getSession() != $session_id) {
+        if (!empty($session_id) && ($this->getSession() !== $session_id)) {
             $old_session = $this->setSession($session_id);
         } else {
             if ($this->session_autocreate && $this->getSession() === null) {
@@ -616,32 +617,6 @@ public function getOption($key)
         return isset($this->options[$key]) ? $this->options[$key] : null;
     }
 
-    /**
-     * Set session_id to http-request options
-     * if session_id not specified (or specified as null) create and set random.
-     *
-     * @param string|null $session_id session_id or null for generate new id
-     * @param boolean $overwrite false = set only if session not defined, true = always
-     * @return string|null Return old value of session_id option
-     */
-    public function setSession($session_id = null, $overwrite = true)
-    {
-        if (\is_null($session_id)) {
-            $session_id = \md5(\uniqid(\mt_rand(0, \PHP_INT_MAX), true));
-        }
-        return $this->setOption('session_id', $session_id, $overwrite);
-    }
-
-    /**
-     * Return current session_id from http-options. Return null if not exists.
-     *
-     * @return string|null
-     */
-    public function getSession()
-    {
-        return $this->getOption('session_id');
-    }
-
     /**
      * Delete http-option by specified key
      *
@@ -733,7 +708,7 @@ public function versionSendQuery()
     {
         // save to_slot and old session_id for restore it after complete
         $old_to_slot = $this->to_slot;
-        $old_sess = $this->setSession(null, false);
+        $old_sess = $this->setSession(false, false);
 
         $query = 'SELECT version()';
 

src/ClickHouseFunctions.php

@@ -398,52 +398,6 @@ public function getUptime()
         return $this->queryValue('SELECT uptime()');
     }
 
-    /**
-     * Get current database name.
-     *
-     * if option 'database' is not empty, return database from options.
-     * Otherwise using SQL-query 'SELECT currentDatabase()' for current or specified session
-     *
-     * Keep in mind that current database can be set in two ways:
-     *  - by option 'database', in this case '&database=...' is sent with each request
-     *  - by SQL-request 'USE $db' - it only makes sense when the sessions supported
-     *
-     * @param string|null|true $sess session_id (or true for read only 'database' option)
-     * @return string|false String with current db-name or false if error
-     */
-    public function getCurrentDatabase($sess = null)
-    {
-        $this->to_slot = false;
-        $database = $this->getOption('database');
-        if (!empty($database) || $sess === true) {
-            return $database;
-        }
-        return $this->queryValue('SELECT currentDatabase()', null, $sess);
-    }
-
-    /**
-     * Set current database by name for current or specified session.
-     *
-     * Function send SQL-query 'USE $db' if sessions supported
-     *
-     * If sessions not supported or parameter $sess is boolean true,
-     *  then set current database by option ->setOption('database', $db)
-     *
-     * @param string $db Database name
-     * @param string|null|true $sess session_id or true for use database-option
-     * @return string|false false if ok, or string with error description
-     */
-    public function setCurrentDatabase($db, $sess = null)
-    {
-        $this->to_slot = false;
-        if ($sess === true || !$this->isSupported('session_id')) {
-            $this->setOption('database', $db);
-            return false;
-        } else {
-            return $this->queryFalse("USE " . $db, [], $sess);
-        }
-    }
-
     /**
      * Drop database and remove all tables inside it.
      *