aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-02-01 10:38:26 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-02-02 09:16:06 -0800
commit4ca633e4663b62653ee017e5fd02dd86f06d1200 (patch)
treecc43c9c2b34c3a062c95005f2dc2aa8709b6cd44 /activerecord/lib
parent42dab646eb10e8c7249ad875465679eaf9acc856 (diff)
downloadrails-4ca633e4663b62653ee017e5fd02dd86f06d1200.tar.gz
rails-4ca633e4663b62653ee017e5fd02dd86f06d1200.tar.bz2
rails-4ca633e4663b62653ee017e5fd02dd86f06d1200.zip
Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption
Fix for SQLite binary data corrupter (to master branch)
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb17
1 files changed, 1 insertions, 16 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 55818b3fbf..56ea1a2841 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -6,26 +6,11 @@ module ActiveRecord
module ConnectionAdapters #:nodoc:
class SQLiteColumn < Column #:nodoc:
class << self
- def string_to_binary(value)
- value.gsub(/\0|\%/n) do |b|
- case b
- when "\0" then "%00"
- when "%" then "%25"
- end
- end
- end
-
def binary_to_string(value)
if value.respond_to?(:force_encoding) && value.encoding != Encoding::ASCII_8BIT
value = value.force_encoding(Encoding::ASCII_8BIT)
end
-
- value.gsub(/%00|%25/n) do |b|
- case b
- when "%00" then "\0"
- when "%25" then "%"
- end
- end
+ value
end
end
end