Skip to content

Business intelligence made simple

Fixed error with binary data - fixes #385, closes #387

Andrew Kane011c2c8a0117
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b36eeb59..125cad67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 2.6.1 (unreleased)
- Added `region` setting to Amazon Athena
+- Fixed error with binary data
## 2.6.0 (2022-04-20)
diff --git a/lib/blazer/result.rb b/lib/blazer/result.rb
index 8456ea7c..cd090fa3 100644
--- a/lib/blazer/result.rb
+++ b/lib/blazer/result.rb
@@ -56,6 +56,8 @@ module Blazer
"time"
elsif v.nil?
nil
+ elsif v.is_a?(String) && v.encoding == Encoding::BINARY
+ "binary"
else
"string"
end
diff --git a/test/adapters/mysql_test.rb b/test/adapters/mysql_test.rb
index 99e661c2..bded20b0 100644
--- a/test/adapters/mysql_test.rb
+++ b/test/adapters/mysql_test.rb
@@ -87,6 +87,11 @@ class MysqlTest < ActionDispatch::IntegrationTest
end
end
+ def test_binary
+ # checks for successful response
+ run_statement "SELECT UNHEX('F6'), 1", format: "html"
+ end
+
private
def prepared_statements?
diff --git a/test/support/adapter_test.rb b/test/support/adapter_test.rb
index c3251ad1..982eac72 100644
--- a/test/support/adapter_test.rb
+++ b/test/support/adapter_test.rb
@@ -32,8 +32,8 @@ module AdapterTest
assert_error "Variable cannot be used in this position", statement, **params
end
- def run_statement(statement, **params)
- run_query statement, **params, data_source: data_source, format: "csv"
- CSV.parse(response.body, headers: true).map(&:to_h)
+ def run_statement(statement, format: "csv", **params)
+ run_query statement, **params, data_source: data_source, format: format
+ CSV.parse(response.body, headers: true).map(&:to_h) if format == "csv"
end
end