X-auth althernative added

Author: ierusalim

src/ClickHouseAPI.php

@@ -432,17 +432,17 @@ public function doQuery(
             }
         }
 
-        $h_parameters = \array_merge(
+        $h_params = \array_merge(
             \compact('user', 'password', 'query'),
             $this->options
         );
 
-        if (isset($h_parameters['session_id']) && !$this->isSupported('session_id')) {
-            unset($h_parameters['session_id']);
+        if (isset($h_params['session_id']) && !$this->isSupported('session_id')) {
+            unset($h_params['session_id']);
         }
 
         $response_data = $this->doApiCall(
-            $this->server_url, $h_parameters, $is_post, $post_data, $file, $put
+            $this->server_url, $h_params, $is_post, $post_data, $file, $put
         );
 
         // Restore old session if need
@@ -559,6 +559,12 @@ public function yiDoApiCall($api_url,
             \curl_setopt($curl_h, \CURLOPT_POST, true);
             \curl_setopt($curl_h, \CURLOPT_POSTFIELDS, $post_data);
         }
+        // No Auth in $h_params ? Try alternative
+            \curl_setopt($curl_h, \CURLOPT_HTTPHEADER, [
+                'X-ClickHouse-User: ' . $this->user,
+                'X-ClickHouse-Key: ' . $this->pass,
+            ]);
+        }
         \curl_setopt_array($curl_h, $this->curl_options);
 
         $response_arr = (yield $curl_h);

src/ClickHouseQuery.php

@@ -481,6 +481,7 @@ public function queryArr($sql, $numeric_keys = false, $sess = null)
                             $this->names = $x;
                         }
                     } else {
+                        while(\count($x) < \count($keys)) $x[]='';
                         $ret[] = \array_combine($keys, $x);
                     }
                 }

tests/src/ClickHouseAPITest.php

@@ -81,6 +81,7 @@ public function testSetServerUrlException()
     public function testDoApiCall()
     {
         $ch = $this->object;
+        $ch->debug = true;
 
         // $ch->toSlot()->doApiCall - clear async-mode, than do..
 
@@ -126,7 +127,7 @@ public function testYiDoApiCall()
 
             $file_data = '';
             for ($t=1; $t<100; $t++) {
-                $file_data .= $t . "\t2017-12-12\tAny string data\n";
+                $file_data .= $t . "\t2019-12-12\tAny string data\n";
             }
 
             $file_size = file_put_contents($file, $file_data);
@@ -143,14 +144,20 @@ public function testYiDoApiCall()
                 "ENGINE = MergeTree(dt, (id, dt), 8192)");
 
             $ch->is_windows = true;
-
             $ans = $ch->doApiCall(false,
                 ['query' => "INSERT INTO $table $fields FORMAT TabSeparated"],
                 true, [], $file, true);
 
-            $ch->query("SELECT * FROM $table");
-            $this->assertEquals($file_data, $ch->results);
+            if ($ans['code'] == 200) {
+
+                $ch->query("SELECT * FROM $table");
 
+                $this->assertEquals($file_data, $ch->results);
+
+            } else {
+                echo "Error on try upload file:";
+                echo $ans['code'] . ' ' . $ans['curl_error'] . "\n";
+            }
             $ch->is_windows = false;
 
             try {