Business intelligence made simple
Improved error handling for ClickHouse [skip ci]
Andrew Kane35a78710c406
diff --git a/lib/blazer/adapters/clickhouse_adapter.rb b/lib/blazer/adapters/clickhouse_adapter.rbindex ff8ca3ab..d609d029 100644--- a/lib/blazer/adapters/clickhouse_adapter.rb+++ b/lib/blazer/adapters/clickhouse_adapter.rb@@ -6,33 +6,34 @@ module Blazerrows = []error = nil+ res = nilbeginres = execute("#{statement} /*#{comment}*/", bind_params)+ rescue Errno::ECONNREFUSED => e+ error = e.message+ end- if res.is_a?(Net::HTTPSuccess)- data = JSON.parse(res.body)- columns = data["meta"].map { |v| v["name"] }- rows = data["data"]- data["meta"].each_with_index do |c, i|- type = c["type"]- type = type[9..-2] if type.start_with?("Nullable(")- if type.start_with?("DateTime")- utc = ActiveSupport::TimeZone["Etc/UTC"]- rows.each do |row|- row[i] &&= utc.parse(row[i])- end- elsif ["Date", "Date32"].include?(type)- rows.each do |row|- row[i] &&= Date.parse(row[i])- end+ if res.is_a?(Net::HTTPSuccess)+ data = JSON.parse(res.body)+ columns = data["meta"].map { |v| v["name"] }+ rows = data["data"]+ data["meta"].each_with_index do |c, i|+ type = c["type"]+ type = type[9..-2] if type.start_with?("Nullable(")+ if type.start_with?("DateTime")+ utc = ActiveSupport::TimeZone["Etc/UTC"]+ rows.each do |row|+ row[i] &&= utc.parse(row[i])+ end+ elsif ["Date", "Date32"].include?(type)+ rows.each do |row|+ row[i] &&= Date.parse(row[i])endend- else- error = res.body- error = Blazer::TIMEOUT_MESSAGE if error.include?("TIMEOUT_EXCEEDED")end- rescue => e- error = e.message+ elsif res+ error = res.body+ error = Blazer::TIMEOUT_MESSAGE if error.include?("TIMEOUT_EXCEEDED")end[columns, rows, error]