for ReadOnly users need set : client->setReadOnlyUser(true); or `$c…

…onfi['readonly']` , see exam19_readonly_user.php
smi2 · Dec 9, 2016 · 89cbbe7 · 89cbbe7
1 parent c7a7fcf
commit 89cbbe7
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -466,6 +466,10 @@ MIT
 
 ChangeLog
 ---
+### 2016-12-09
+- for ReadOnly users need set : `client->setReadOnlyUser(true);` or `$confi['readonly']` , see exam19_readonly_user.php
+
+
 ###  2016-11-25
 - `client->truncateTable('tableName')`
 - `cluster->getMasterNodeForTable('dbName.tableName') // node have is_leader=1`

diff --git a/example/exam18_log_queries.php b/example/exam18_log_queries.php
@@ -14,5 +14,3 @@
 $db->enableLogQueries()->enableHttpCompression();
 //----------------------------------------
 print_r($db->select('SELECT * FROM system.query_log')->rows());
-
-//----------------------------------------
diff --git a/example/exam19_readonly_user.php b/example/exam19_readonly_user.php
@@ -0,0 +1,48 @@
+<?php
+
+include_once __DIR__ . '/../include.php';
+
+$config = [
+    'host' => '192.168.1.20',
+    'port' => '8123',
+    'username' => 'ro',
+    'password' => 'ro'
+];
+
+$db = new ClickHouseDB\Client($config);
+
+
+$db->enableExtremes(true)->enableHttpCompression();
+$db->setReadOnlyUser(true);
+
+
+// exec
+$db->showDatabases();
+
+// ----------------------------
+
+
+$config = [
+    'host' => '192.168.1.20',
+    'port' => '8123',
+    'username' => 'ro',
+    'password' => 'ro',
+    'readonly' => true
+];
+
+$db = new ClickHouseDB\Client($config);
+
+//$db->enableLogQueries()->enableHttpCompression();
+//----------------------------------------
+//print_r($db->select('SELECT * FROM system.query_log')->rows());
+
+//----------------------------------------
+
+$db->enableExtremes(true)->enableHttpCompression();
+
+
+
+$db->showDatabases();
+
+echo "OK?\n";
+// ---------
diff --git a/src/Client.php b/src/Client.php
@@ -35,6 +35,10 @@ class Client
      */
     private $_connect_port = false;
 
+    /**
+     * @var bool
+     */
+    private $_connect_user_readonly=false;
     /**
      * @var array
      */
@@ -91,8 +95,27 @@ public function __construct($connect_params, $settings = [])
             $this->settings()->apply($settings);
         }
 
+
+        if (isset($connect_params['readonly']))
+        {
+            $this->setReadOnlyUser($connect_params['readonly']);
+        }
+
+
+
+
     }
 
+    /**
+     * если у пользовалетя установленно только чтение в конфиге
+     *
+     * @param $flag
+     */
+    public function setReadOnlyUser($flag)
+    {
+        $this->_connect_user_readonly=$flag;
+        $this->settings()->setReadOnlyUser($this->_connect_user_readonly);
+    }
     /**
      * Очистить пред обработку запроса [шаблонизация]
      *

diff --git a/src/Settings.php b/src/Settings.php
@@ -20,6 +20,8 @@ class Settings
      */
     private $settings = [];
 
+    private $_ReadOnlyUser=false;
+
 
     /**
      * Settings constructor.
@@ -143,6 +145,23 @@ public function apply($settings_array)
         return $this;
     }
 
+    /**
+     * @param $flag
+     */
+    public function setReadOnlyUser($flag)
+    {
+        $this->_ReadOnlyUser=$flag;
+    }
+
+    /**
+     *
+     *
+     */
+    public function isReadOnlyUser()
+    {
+        return $this->_ReadOnlyUser;
+    }
+
     /**
      * @param $name
      * @return mixed|null

diff --git a/src/Transport/Http.php b/src/Transport/Http.php
@@ -146,6 +146,17 @@ private function getUrl($params = [])
             $settings = array_merge($settings, $params);
         }
 
+
+        if ($this->settings()->isReadOnlyUser())
+        {
+            unset($settings['extremes']);
+            unset($settings['readonly']);
+            unset($settings['enable_http_compression']);
+            unset($settings['max_execution_time']);
+
+        }
+
+
         return $this->getUri() . '?' . http_build_query($settings);
     }
 
@@ -195,6 +206,9 @@ private function makeRequest(Query $query, $urlParams = [], $query_as_string = f
         $new = $this->newRequest($extendinfo);
         $new->url($url);
 
+
+
+
         if (!$query_as_string) {
             $new->parameters_json($sql);
         }
@@ -311,7 +325,7 @@ public function getRequestRead(Query $query, $whereInFile = null, $writeToFile =
         // if result to file
         if ($writeToFile instanceof WriteToFile && $writeToFile->fetchFormat()) {
             $query->setFormat($writeToFile->fetchFormat());
-            $urlParams['extremes'] = false;
+            unset($urlParams['extremes']);
         }
         // ---------------------------------------------------------------------------------
         // makeRequest read