Skip to content

Commit 34c55b0

Browse files
authored
Merge pull request #2789 from ojiry/support_oracle
Fix #encoding error by oracle_enhanced
2 parents cc8d5e6 + f39d260 commit 34c55b0

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

lib/rails_admin/adapters/active_record.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ def encoding
7272
::ActiveRecord::Base.connection.select_one("SELECT ''::text AS str;").values.first.encoding
7373
when 'mysql2'
7474
::ActiveRecord::Base.connection.instance_variable_get(:@connection).encoding
75+
when 'oracle_enhanced'
76+
::ActiveRecord::Base.connection.select_one("SELECT dummy FROM DUAL").values.first.encoding
7577
else
7678
::ActiveRecord::Base.connection.select_one("SELECT '' AS str;").values.first.encoding
7779
end

0 commit comments

Comments
 (0)