blazer 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6deb8aff915dbda37c6d49f0469e9d0244faf48ee24bff2e486ac467ab13e90e
-  data.tar.gz: 8b93cfc07025251e4a216f0cb42e5d91baa739d0107c874bbc41d7cd28653823
+  metadata.gz: ecc87353b5a9b96402e82c59b497929b5544f320d6c9f82316b92d005c18f74d
+  data.tar.gz: 19b1a0697e3901e25c8b77f2ce769d427849c97f8012240fdce26a74f069c03d
 SHA512:
-  metadata.gz: 17e7e661e5a0339baf19bd7278e1661645890bc59d3db06db00ceacdc7671471f41c66f5e8dadaf8ba1746bc072d374b97328d9178dc099a25943ede2f33d29a
-  data.tar.gz: f4cf77965a7f906f790da30205e28f43ec1c22fbda3dfa3d0e4091be95fd007435a5a079caac616f6096fd2927c064f1d216976924b67080bc9b33534f780666
+  metadata.gz: c090577a5e80ac9ae9a870e096d1317b78cd7815fb6f9e65a1e59bb41fb779d2cbac6f37ec3cb3854351069d57b52b5937fa7cb1e0a85d73919ee59229501d8a
+  data.tar.gz: 1590b68605c634a98a3ee4794eae49c5b19b9d683ff453871117983684e70c3b0c3222298e63a312719b9a676aa3d364a56dcc1664c10c2146800736103e4638

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 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
+
 ## 3.0.1 (2023-10-08)
 
 - Fixed error with Rails 7.1 when no user model

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/app/controllers/blazer/base_controller.rb

@@ -30,6 +30,8 @@ module Blazer
 
     layout "blazer/application"
 
+    default_form_builder ::ActionView::Helpers::FormBuilder
+
     private
 
     def process_vars(statement, var_params = nil)

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: /, "")
@@ -194,10 +200,10 @@ module Blazer
 
       # Redshift adapter silently ignores binds
       def parameter_binding
-        if postgresql? && (ActiveRecord::VERSION::STRING.to_f >= 6.1 || prepared_statements?)
-          # Active Record < 6.1 silently ignores binds with Postgres when prepared statements are disabled
+        if postgresql?
           :numeric
-        elsif sqlite?
+        elsif sqlite? && prepared_statements?
+          # Active Record silently ignores binds with SQLite when prepared statements are disabled
           :numeric
         elsif mysql? && prepared_statements?
           # Active Record silently ignores binds with MySQL when prepared statements are disabled

data/lib/blazer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-08 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