diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-02 15:09:03 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-02 15:09:03 +0000 |
commit | 089ef42520968c7852c97faf07e5101685885150 (patch) | |
tree | 9a458179781134d769688b2237c615664e98a7cd /activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | |
parent | 959f362ac483bb12dab7d0207d973f1ebadcb033 (diff) | |
download | rails-089ef42520968c7852c97faf07e5101685885150.tar.gz rails-089ef42520968c7852c97faf07e5101685885150.tar.bz2 rails-089ef42520968c7852c97faf07e5101685885150.zip |
Fixed handling of binary content in blobs and similar fields for Ruby/MySQL and SQLite #409 [xal]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@309 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 604fc960aa..4dc8d634b3 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -25,6 +25,28 @@ module ActiveRecord end module ConnectionAdapters + + class SQLiteColumn < Column + + def string_to_binary(value) + value.gsub(/(\0|\%)/) do + case $1 + when "\0" then "%00" + when "%" then "%25" + end + end + end + + def binary_to_string(value) + value.gsub(/(%00|%25)/) do + case $1 + when "%00" then "\0" + when "%25" then "%" + end + end + end + + end class SQLiteAdapter < AbstractAdapter # :nodoc: def select_all(sql, name = nil) select(sql, name) @@ -37,7 +59,7 @@ module ActiveRecord def columns(table_name, name = nil) table_structure(table_name).inject([]) do |columns, field| - columns << Column.new(field['name'], field['dflt_value'], field['type']) + columns << SQLiteColumn.new(field['name'], field['dflt_value'], field['type']) columns end end |