blazer 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a0f6a621ff07778431c643a27d6d96b0504c92d6ac84367f54e5854c37565c1
-  data.tar.gz: dd85572e78f48dec27699bdcd8dfb026275acf338f81b3b6a9647556786a0c4a
+  metadata.gz: ecc87353b5a9b96402e82c59b497929b5544f320d6c9f82316b92d005c18f74d
+  data.tar.gz: 19b1a0697e3901e25c8b77f2ce769d427849c97f8012240fdce26a74f069c03d
 SHA512:
-  metadata.gz: 46e5a13f62a1ef05a7f668f839e83d931df7607851f65ccd31f15c3c77dce6ece3d6e3a62674ae11595851413e537059891de97ddd28fc44f23a7185663d83f6
-  data.tar.gz: 8bb2315848095962f00a8c6d4e643c0f468c96c89bf88f7c43da22511d536a50ca8b84d16a4e79707ff54c5eaa8fc3371da9944b3661cccc40c90e4165b70030
+  metadata.gz: c090577a5e80ac9ae9a870e096d1317b78cd7815fb6f9e65a1e59bb41fb779d2cbac6f37ec3cb3854351069d57b52b5937fa7cb1e0a85d73919ee59229501d8a
+  data.tar.gz: 1590b68605c634a98a3ee4794eae49c5b19b9d683ff453871117983684e70c3b0c3222298e63a312719b9a676aa3d364a56dcc1664c10c2146800736103e4638

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.3 (2024-01-10)
+
+- Fixed error with Trilogy, non-ASCII column names, and charts
+
 ## 3.0.2 (2023-11-28)
 
 - Fixed error with SQLite and prepared statements

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2023 Andrew Kane
+Copyright (c) 2014-2024 Andrew Kane
 
 MIT License
 

data/README.md

@@ -10,7 +10,7 @@ Blazer is also available as a [Docker image](https://github.com/ankane/blazer-do
 
 :tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
 
-[![Build Status](https://github.com/ankane/blazer/workflows/build/badge.svg?branch=master)](https://github.com/ankane/blazer/actions)
+[![Build Status](https://github.com/ankane/blazer/actions/workflows/build.yml/badge.svg)](https://github.com/ankane/blazer/actions)
 
 ## Features
 

data/lib/blazer/adapters/sql_adapter.rb

@@ -21,15 +21,21 @@ module Blazer
         error = nil
 
         begin
+          result = nil
           in_transaction do
             set_timeout(data_source.timeout) if data_source.timeout
-
             binds = bind_params.map { |v| ActiveRecord::Relation::QueryAttribute.new(nil, v, ActiveRecord::Type::Value.new) }
             result = connection_model.connection.select_all("#{statement} /*#{comment}*/", nil, binds)
-            columns = result.columns
-            result.rows.each do |untyped_row|
-              rows << (result.column_types.empty? ? untyped_row : columns.each_with_index.map { |c, i| untyped_row[i] && result.column_types[c] ? result.column_types[c].send(:cast_value, untyped_row[i]) : untyped_row[i] })
-            end
+          end
+
+          columns = result.columns
+          result.rows.each do |untyped_row|
+            rows << (result.column_types.empty? ? untyped_row : columns.each_with_index.map { |c, i| untyped_row[i] && result.column_types[c] ? result.column_types[c].send(:cast_value, untyped_row[i]) : untyped_row[i] })
+          end
+
+          # fix for non-ASCII column names and charts
+          if adapter_name == "Trilogy"
+            columns.map! { |k| k.dup.force_encoding(Encoding::UTF_8) }
           end
         rescue => e
           error = e.message.sub(/.+ERROR: /, "")

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email: andrew@ankane.org
 executables: []
@@ -237,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Explore your data with SQL. Easily create charts and dashboards, and share