diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-07 15:01:04 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-07 15:01:04 -0800 |
| commit | 85237842657132e8fe34bd460d3db2adee077d37 (patch) | |
| tree | d2d543c8a21283b20eb25537e820ecf29bd90ea9 /activerecord | |
| parent | 30f0d7bac8240ba734ad37f42448f84e5eaf7023 (diff) | |
| download | rails-85237842657132e8fe34bd460d3db2adee077d37.tar.gz rails-85237842657132e8fe34bd460d3db2adee077d37.tar.bz2 rails-85237842657132e8fe34bd460d3db2adee077d37.zip | |
the required sqlite3 adapter responds to encoding, so stop checking.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 386b3f7465..11bb457d03 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -47,11 +47,7 @@ module ActiveRecord # Returns the current database encoding format as a string, eg: 'UTF-8' def encoding - if @connection.respond_to?(:encoding) - @connection.encoding.to_s - else - @connection.execute('PRAGMA encoding')[0]['encoding'] - end + @connection.encoding.to_s end end |