Merge 88fd97a into cda8175

railsadminteam · Dec 7, 2016 · 8f38a5f · 8f38a5f
2 parents cda8175 + 88fd97a
commit 8f38a5f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/lib/rails_admin/adapters/active_record.rb b/lib/rails_admin/adapters/active_record.rb
@@ -72,6 +72,8 @@ def encoding
           ::ActiveRecord::Base.connection.select_one("SELECT ''::text AS str;").values.first.encoding
         when 'mysql2'
           ::ActiveRecord::Base.connection.instance_variable_get(:@connection).encoding
+        when 'oracle_enhanced'
+          ::ActiveRecord::Base.connection.select_one("SELECT dummy FROM DUAL").values.first.encoding
         else
           ::ActiveRecord::Base.connection.select_one("SELECT '' AS str;").values.first.encoding
         end