diff --git a/CHANGELOG.md b/CHANGELOG.md index e1c96649b..f36c72a10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.0.3 (unreleased) + +- Fixed error with Trilogy, non-ASCII column names, and charts + ## 3.0.2 (2023-11-28) - Fixed error with SQLite and prepared statements diff --git a/lib/blazer/adapters/sql_adapter.rb b/lib/blazer/adapters/sql_adapter.rb index 0d152b082..ee4a086fb 100644 --- a/lib/blazer/adapters/sql_adapter.rb +++ b/lib/blazer/adapters/sql_adapter.rb @@ -41,6 +41,11 @@ def run_statement(statement, comment, bind_params = []) reconnect if error.include?("PG::ConnectionBad") end + # fix for non-ASCII column names and charts + if adapter_name == "Trilogy" + columns.map! { |k| k.dup.force_encoding(Encoding::UTF_8) } + end + [columns, rows, error] end