Fixed error with Trilogy, non-ASCII column names, and charts - fixes #…

…459
ankane · Jan 6, 2024 · fd04dd0 · fd04dd0
1 parent ccad905
commit fd04dd0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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