pg-hstore 1.1.5 → 1.1.6

data/lib/pg_hstore.rb

@@ -1,6 +1,7 @@
 module PgHstore
   SINGLE_QUOTE = "'"
   DOUBLE_QUOTE = '"'
+  DOLLAR_QUOTE = '$$' # TODO not infallible
   HASHROCKET = '=>'
   COMMA = ','
 
@@ -12,7 +13,7 @@ module PgHstore
   # set symbolize_keys = false if you want string keys
   # thanks to https://github.com/engageis/activerecord-postgres-hstore for regexps!
   def PgHstore.load(hstore, symbolize_keys = true)
-    hstore = unquote hstore, SINGLE_QUOTE
+    hstore = unquote hstore, DOLLAR_QUOTE
     hstore.scan(PAIR).inject({}) do |memo, (k, v)|
       k = unescape unquote(k, DOUBLE_QUOTE)
       k = k.to_sym if symbolize_keys
@@ -28,23 +29,15 @@ module PgHstore
       if v.nil?
         v = "NULL"
       else
-        v = escape v
-        unless for_parameter
-          v = escape_single_quotes v
-        end
-        v = DOUBLE_QUOTE + v + DOUBLE_QUOTE
+        v = DOUBLE_QUOTE + escape(v) + DOUBLE_QUOTE
       end
-      k = escape k
-      unless for_parameter
-        k = escape_single_quotes k
-      end
-      k = DOUBLE_QUOTE + k + DOUBLE_QUOTE
+      k = DOUBLE_QUOTE + escape(k) + DOUBLE_QUOTE
       [k, v].join HASHROCKET
-    end.join(COMMA)
+    end.join COMMA
     if for_parameter
       memo
     else
-      SINGLE_QUOTE + memo + SINGLE_QUOTE
+      DOLLAR_QUOTE + memo + DOLLAR_QUOTE
     end
   end
 
@@ -57,7 +50,8 @@ module PgHstore
 
   def PgHstore.unquote(string, quote_char)
     if string.start_with? quote_char
-      string[1..-2]
+      l = quote_char.length
+      string[l..(-1-l)]
     else
       string
     end
@@ -65,7 +59,7 @@ module PgHstore
 
   ESCAPED_CHAR = /\\(.)/
   def PgHstore.unescape(literal)
-    literal.gsub(ESCAPED_CHAR, '\1').gsub ESCAPED_SINGLE_QUOTE, SINGLE_QUOTE
+    literal.gsub ESCAPED_CHAR, '\1'
   end
   
   NON_ESCAPE_SLASH = '\\'
@@ -74,11 +68,5 @@ module PgHstore
   def PgHstore.escape(string)
     string.to_s.gsub(NON_ESCAPE_SLASH) {ESCAPED_SLASH}.gsub DOUBLE_QUOTE, ESCAPED_DOUBLE_QUOTE
   end
-
-  ESCAPED_SINGLE_QUOTE = "''"
-  def PgHstore.escape_single_quotes(literal)
-    literal.to_s.gsub SINGLE_QUOTE, ESCAPED_SINGLE_QUOTE
-  end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg-hstore
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -17,17 +17,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: postgresql hstore parser/deparser - provides PgHstore.dump and PgHstore.load
   (aka parse)
 email: