jeremyevans-postgres-pr 0.6.3 → 0.6.4

data/lib/postgres-pr/typeconv/bytea.rb

@@ -4,6 +4,7 @@ module Postgres::Conversion
   # For encoding rules see:
   #   http://www.postgresql.org/docs/7.4/static/datatype-binary.html
   #
+  # The historical bytea escape format is always used, for maximum compatibility.
   def encode_bytea(str)
     # each_byte used instead of [] for 1.9 compatibility
     str.gsub(/[\000-\037\047\134\177-\377]/){|b| "\\#{sprintf('%o', b.each_byte{|x| break x}).rjust(3, '0')}"}
@@ -14,9 +15,16 @@ module Postgres::Conversion
   # For decoding rules see:
   #   http://www.postgresql.org/docs/7.4/static/datatype-binary.html
   #
+  # Supports both the historical escape format and the new 9.0+ hex format.
   def decode_bytea(str)
-    str.gsub(/\\(\\|'|[0-3][0-7][0-7])/) {|s|
-      if s.size == 2 then s[1,1] else s[1,3].oct.chr end
-    }
+    if str =~ /\A\\x/
+      # PostgreSQL 9.0+ bytea hex format
+      str[2..-1].gsub(/(..)/){|s| s.to_i(16).chr}
+    else
+      # Historical PostgreSQL bytea escape format
+      str.gsub(/\\(\\|'|[0-3][0-7][0-7])/) {|s|
+        if s.size == 2 then s[1,1] else s[1,3].oct.chr end
+      }
+    end
   end
 end

data/lib/postgres-pr/version.rb

@@ -1,3 +1,3 @@
 module PostgresPR
-  Version = "0.6.3"
+  Version = "0.6.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jeremyevans-postgres-pr
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -07:00
+date: 2010-10-05 00:00:00 -07:00
 default_executable: 
 dependencies: []