new pg-hstore with real support for bind variables

seamusabshere · Dec 20, 2012 · 364eda2 · 364eda2
1 parent 94b6e31
commit 364eda2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+1.1.6 / 2012-12-20
+
+* Bug fixes
+
+  * Require pg-hstore >=1.1.1 which doesn't escape single quotes and backslashes when output is going to be used in a bind variable (as it is here)
+
 1.1.5 / 2012-12-10
 
 * Bug fixes

diff --git a/lib/upsert/connection/postgresql.rb b/lib/upsert/connection/postgresql.rb
@@ -6,7 +6,7 @@ def bind_value(v)
         case v
         when Hash
           # you must require 'pg_hstore' from the 'pg-hstore' gem yourself
-          ::PgHstore.dump(v)[1...-1]
+          ::PgHstore.dump v, true
         else
           super
         end

diff --git a/lib/upsert/version.rb b/lib/upsert/version.rb
@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end
diff --git a/spec/hstore_spec.rb b/spec/hstore_spec.rb
@@ -30,10 +30,15 @@
       crazy = PgHstore.parse row['crazy']
       crazy.should == { a: '1', whatdat: 'whodat' }
 
+      upsert.row({name: 'Bill'}, crazy: {whatdat: "D'ONOFRIO"})
+      row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
+      crazy = PgHstore.parse row['crazy']
+      crazy.should == { a: '1', whatdat: "D'ONOFRIO" }
+
       upsert.row({name: 'Bill'}, crazy: {a: 2})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
-      crazy.should == { a: '2', whatdat: 'whodat' }
+      crazy.should == { a: '2', whatdat: "D'ONOFRIO" }
     end
   end
 end if ENV['DB'] == 'postgresql'
diff --git a/upsert.gemspec b/upsert.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'activerecord-import'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'pg-hstore', ">=1.1.0"
+  gem.add_development_dependency 'pg-hstore', ">=1.1.2"
 
   unless RUBY_VERSION >= '1.9'
     gem.add_development_dependency 'orderedhash'