upsert 1.1.4 → 1.1.5

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.1.5 / 2012-12-10
+
+* Bug fixes
+
+  * Properly cast "timestamp without time zone" in postgres - thanks @markmarijnissen! https://github.com/seamusabshere/upsert/issues/11
+
 1.1.4 / 2012-12-06
 
 * Enhancements

data/lib/upsert/column_definition.rb

@@ -40,7 +40,11 @@ class Upsert
     end
 
     def to_selector
-      "#{quoted_name} = #{quoted_selector_name}"
+      if temporal?
+        "#{quoted_name} = CAST(#{quoted_selector_name} AS #{sql_type})"
+      else
+        "#{quoted_name} = #{quoted_selector_name}"
+      end
     end
 
     def temporal?

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/spec/spec_helper.rb

@@ -100,6 +100,9 @@ class Pet < ActiveRecord::Base
   col :tag_number, :type => :integer
   col :birthday, :type => :date
   col :home_address, :type => :text
+  if ENV['DB'] == 'postgresql'
+    col :tsntz, :type => 'timestamp without time zone'
+  end
   add_index :name, :unique => true
 end
 Pet.auto_upgrade!

data/spec/timezones_spec.rb

@@ -45,5 +45,14 @@ describe Upsert do
       end
     end
 
+    if ENV['DB'] == 'postgresql'
+      it "doesn't die on timestamp without time zone (postgresql)" do
+        time = Time.new.utc
+        upsert = Upsert.new $conn, :pets
+        assert_creates(Pet, [[{:name => 'Jerry'}, {:tsntz => time}]]) do
+          upsert.row({:name => 'Jerry'}, {:tsntz => time})
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core