Skip to content
Browse files

Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption

Fix for SQLite binary data corrupter (to master branch)
  • Loading branch information...
1 parent 42dab64 commit 4ca633e4663b62653ee017e5fd02dd86f06d1200 @tenderlove tenderlove committed Feb 1, 2012
View
17 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
View
1 activerecord/test/assets/test.txt
@@ -0,0 +1 @@
+%00
View
2 activerecord/test/cases/binary_test.rb
@@ -8,7 +8,7 @@
require 'models/binary'
class BinaryTest < ActiveRecord::TestCase
- FIXTURES = %w(flowers.jpg example.log)
+ FIXTURES = %w(flowers.jpg example.log test.txt)
def test_mixed_encoding
str = "\x80"

0 comments on commit 4ca633e

Please sign in to comment.
Something went wrong with that request. Please try again.