From f82fb5ec3d70b03e33bd3377c786cb26c7995647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Fri, 22 Nov 2019 14:55:29 +0100 Subject: [PATCH] B #3946: Fix encoding for new debian/ubuntu --- src/onedb/onedb_backend.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/onedb/onedb_backend.rb b/src/onedb/onedb_backend.rb index 31f6c6c33c..395fed99e6 100644 --- a/src/onedb/onedb_backend.rb +++ b/src/onedb/onedb_backend.rb @@ -301,6 +301,7 @@ class BackEndMySQL < OneDBBacKEnd @db.fetch('select default_character_set_name FROM information_schema.SCHEMATA'\ " WHERE schema_name = \"#{@db_name}\"") do |row| db_enc = row[:default_character_set_name] + db_enc ||= row[:DEFAULT_CHARACTER_SET_NAME] end @db.fetch('select CCSA.character_set_name FROM information_schema.`TABLES`'\ @@ -308,6 +309,7 @@ class BackEndMySQL < OneDBBacKEnd 'WHERE CCSA.collation_name = T.table_collation AND T.table_schema = '\ "\"#{@db_name}\" AND T.table_name = \"system_attributes\"") do |row| table_enc = row[:character_set_name] + table_enc ||= row[:CHARACTER_SET_NAME] end if db_enc != table_enc && !table_enc.empty?