influxdb-client 2.9.0.pre.6184 → 2.9.0.pre.6326

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82305cde68d2b11f1dc09be7206e437333cef3d3ef8054e0823726678568607d
-  data.tar.gz: ef992e7f599ae6e1e3ba98b4e2517a728397a95367eb77e85fc5f662c9cb99e6
+  metadata.gz: b6cb295165aaf2b2c7258a33d5c8b97a304df8d1a57a7922b87add1fa2d80e0d
+  data.tar.gz: b3bbb0e1c859851eae554301a0859dc63ab974e02d91481fede961ccc9174691
 SHA512:
-  metadata.gz: 15d8dede5715ec792c3f11fae031e1b4e374e4a5c56bf4da40bb267a4af9551475d5d1b2a42ad042dda49e1fc568f8f555d5807bedcaed97a3efa5b3a38ce210
-  data.tar.gz: 37ab24a137e4776e27682cbffaf06eef1a621f8d23427b22aacb0673065b68f4a92a4d2d8b07be8e6764df167280b69738a74591f4e237bfe08599658bb5cabf
+  metadata.gz: 0e118873cab062084c16c66de8d92bafd7e3dc7d8f0d86186d5966003b9378cfda269ed897e4e9405958f27289490bfedb0cc6cdd4f8dff51f5cc938dd60df02
+  data.tar.gz: 0ebf3f5058918f06247c7c7fe41ca29308a6ba8c219ffa9cabeaf316bd9768f84da8e250290cb4c6f91495944b8efd606d67cb8d49a9ff99375245e7a3dd7fe4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 2.9.0 [unreleased]
 
+### Bug Fixes
+1. [#123](https://github.com/influxdata/influxdb-client-ruby/pull/123): Duplicate columns warning shows in improper situations
+1. [#124](https://github.com/influxdata/influxdb-client-ruby/pull/124): Query return type is `Array` instead of `Hash`
+
 ## 2.8.0 [2022-10-27]
 
 ### Features

data/lib/influxdb2/client/client.rb

@@ -51,7 +51,6 @@ module InfluxDB2
     # @option options [Logger] :logger Logger used for logging. Disable logging by set to false.
     # @option options [bool] :debugging Enable debugging for HTTP request/response.
     # @option options [Hash] :tags Default tags which will be added to each point written by api.
-    #   the body line-protocol
     def initialize(url, token, options = nil)
       @auto_closeable = []
       @options = options ? options.dup : {}

data/lib/influxdb2/client/flux_csv_parser.rb

@@ -60,7 +60,7 @@ module InfluxDB2
     def initialize(response, stream: false, response_mode: InfluxDB2::FluxResponseMode::FULL)
       @response = response
       @stream = stream
-      @tables = {}
+      @tables = []
 
       @table_index = 0
       @table_id = -1
@@ -188,7 +188,7 @@ module InfluxDB2
         i += 1
       end
 
-      duplicates = table.columns.group_by { :label }.select { |_k, v| v.size > 1 }
+      duplicates = table.columns.group_by(&:label).select { |_k, v| v.size > 1 }
 
       warning = "The response contains columns with duplicated names: #{duplicates.keys.join(', ')}
 You should use the 'FluxRecord.row to access your data instead of 'FluxRecord.values' hash."

data/test/influxdb/flux_csv_parser_test.rb

@@ -516,14 +516,44 @@ class FluxCsvParserErrorTest < MiniTest::Test
 ,,0,2022-09-13T06:14:40.469404272Z,2022-09-13T06:24:40.469404272Z,2022-09-13T06:24:39.299Z,my_measurement,Prague,25.3
 ,,0,2022-09-13T06:14:40.469404272Z,2022-09-13T06:24:40.469404272Z,2022-09-13T06:24:40.454Z,my_measurement,Prague,25.3'
 
-    tables = InfluxDB2::FluxCsvParser.new(data, stream: false, response_mode: InfluxDB2::FluxResponseMode::ONLY_NAMES)
-                                     .parse
-                                     .tables
-    assert_equal 1, tables.size
-    assert_equal 8, tables[0].columns.size
-    assert_equal 3, tables[0].records.size
-    assert_equal 7, tables[0].records[0].values.size
-    assert_equal 8, tables[0].records[0].row.size
-    assert_equal 25.3, tables[0].records[0].row[7]
+    out, = capture_io do
+      tables = InfluxDB2::FluxCsvParser.new(data, stream: false, response_mode: InfluxDB2::FluxResponseMode::ONLY_NAMES)
+                                       .parse
+                                       .tables
+
+      assert_equal 1, tables.size
+      assert_equal 8, tables[0].columns.size
+      assert_equal 3, tables[0].records.size
+      assert_equal 7, tables[0].records[0].values.size
+      assert_equal 8, tables[0].records[0].row.size
+      assert_equal 25.3, tables[0].records[0].row[7]
+    end
+
+    assert_match 'The response contains columns with duplicated names: result', out
+  end
+
+  def test_parse_without_duplicates
+    data = '#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,string,string,double
+#group,false,false,true,true,false,true,true,false
+#default,_result,,,,,,,
+ ,result,table,_start,_stop,_time,_measurement,location,result2
+,,0,2022-09-13T06:14:40.469404272Z,2022-09-13T06:24:40.469404272Z,2022-09-13T06:24:33.746Z,my_measurement,Prague,25.3
+,,0,2022-09-13T06:14:40.469404272Z,2022-09-13T06:24:40.469404272Z,2022-09-13T06:24:39.299Z,my_measurement,Prague,25.3
+,,0,2022-09-13T06:14:40.469404272Z,2022-09-13T06:24:40.469404272Z,2022-09-13T06:24:40.454Z,my_measurement,Prague,25.3'
+
+    out, = capture_io do
+      tables = InfluxDB2::FluxCsvParser.new(data, stream: false, response_mode: InfluxDB2::FluxResponseMode::ONLY_NAMES)
+                                       .parse
+                                       .tables
+
+      assert_equal 1, tables.size
+      assert_equal 8, tables[0].columns.size
+      assert_equal 3, tables[0].records.size
+      assert_equal 8, tables[0].records[0].values.size
+      assert_equal 8, tables[0].records[0].row.size
+      assert_equal 25.3, tables[0].records[0].row[7]
+    end
+
+    assert_equal '', out
   end
 end

data/test/influxdb/query_api_test.rb

@@ -144,4 +144,22 @@ class QueryApiTest < MiniTest::Test
     assert_requested(:post, 'http://localhost:8086/api/v2/query?org=my-org',
                      times: 1, headers: headers)
   end
+
+  def test_query_result_type
+    stub_request(:post, 'http://localhost:8086/api/v2/query?org=my-org')
+      .to_return(body: SUCCESS_DATA)
+
+    client = InfluxDB2::Client.new('http://localhost:8086', 'my-token',
+                                   bucket: 'my-bucket',
+                                   org: 'my-org',
+                                   use_ssl: false)
+
+    bucket = 'my-bucket'
+    result = client.create_query_api
+                   .query(query: "from(bucket:\"#{bucket}\") |> range(start: 1970-01-01T00:00:00.000000001Z) |> last()")
+
+    assert_equal 1, result.length
+    assert_equal 4, result[0].records.length
+    assert_equal Array, result.class
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 2.9.0.pre.6184
+  version: 2.9.0.pre.6326
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler