upsert 1.1.7 → 1.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTE3MDYwZTVkNjkyOWUwOTc4MmNjYTFmOWI4OGNhZjFkYjk5ZjE0YQ==
+  data.tar.gz: !binary |-
+    MzY5ZDAzZGViY2E5NzQ4NThjOTJiNTg3ZmQ1NTEyMjhmMjRjMjVlNw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MzZjZjlmYmI4Y2QxZWMxMDAwYTcwMjUwMDc1YTZhMzU3MTA0YTY4MWQzNWE4
+    OWMyZDBlOTVmZGNmNTQzZTQ5MzM4NjgxNTFkNzA0MTNhYzIyYWI0N2VmYTY2
+    MDA1YjQ4NjY3Mzg5NWVjMDQ0YmViMzA2NmM1NDZjNmIxNWM2MGM=
+  data.tar.gz: !binary |-
+    MDM2ZTY0YTRlYTVhMmExZGZmMTAyYTEzMjc5YTFmYWVjNjY2MDIxZTg2ODMw
+    YzQ2OWExNmNhNmRjZmQ2YTAxNjdjOTY3NWRhZDQwMjZjNzA2Mzg0NDY0NjBj
+    ZDUzMzhhZjQzNTY5YjE5YmU3NzI0OTkzMTNlZjdmZDg0YjQ4NDE=

data/CHANGELOG

@@ -1,3 +1,17 @@
+1.2.0 / 2013-04-04
+
+* Breaking changes
+
+  * columns named "created_at" and "created_on" will only be set if it's a new row - thanks @derekharmel! https://github.com/seamusabshere/upsert/pull/15
+
+* Enhancements
+
+  * Detect invalid columns passed in either selector or setter - inspired by @atandrau, thanks! https://github.com/seamusabshere/upsert/issues/18
+
+* Bug fixes
+
+  * Always convert symbols to strings when used as bind vars - thanks @towerhe! - https://github.com/seamusabshere/upsert/pull/16
+
 1.1.7 / 2013-01-15
 
 * Enhancements

data/Gemfile

@@ -3,6 +3,3 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in upsert.gemspec
 
 gemspec
-if RUBY_PLATFORM == 'java'
-  gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter'
-end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Brighter Planet, Inc.
+Copyright (c) 2013 Seamus Abshere
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -25,9 +25,11 @@ connection = Mysql2::Client.new([...])
 table_name = :pets
 upsert = Upsert.new connection, table_name
 # N times...
-upsert.row({:name => 'Jerry'}, :breed => 'beagle')
+upsert.row({:name => 'Jerry'}, :breed => 'beagle', :created_at => Time.now)
 ```
 
+The `created_at` and `created_on` columns are used for inserts, but ignored on updates.
+
 So just to reiterate you've got a __selector__ and a __setter__:
 
 ```ruby

data/lib/upsert.rb

@@ -156,6 +156,7 @@ class Upsert
     'PGConn'           => 'PG::Connection',
     'org.sqlite.Conn'  => 'Java::OrgSqliteConn' # for some reason, org.sqlite.Conn doesn't have a ruby class name
   }
+  CREATED_COL_REGEX = /\Acreated_(at|on)\Z/
 
   # @return [Upsert::Connection]
   attr_reader :connection

data/lib/upsert/column_definition/sqlite3.rb

@@ -0,0 +1,27 @@
+class Upsert
+  class ColumnDefinition
+    # @private
+    class Sqlite3 < ColumnDefinition
+      class << self
+        def all(connection, table_name)
+          # activerecord-3.2.13/lib/active_record/connection_adapters/sqlite_adapter.rb
+          connection.execute("PRAGMA table_info(#{connection.quote_ident(table_name)})").map do |row|#, 'SCHEMA').to_hash
+            default = case row["dflt_value"]
+            when /^null$/i
+              nil
+            when /^'(.*)'$/
+              $1.gsub(/''/, "'")
+            when /^"(.*)"$/
+              $1.gsub(/""/, '"')
+            else
+              row["dflt_value"]
+            end
+            new connection, row['name'], row['type'], default
+          end.sort_by do |cd|
+            cd.name
+          end
+        end
+      end
+    end
+  end
+end

data/lib/upsert/connection.rb

@@ -26,6 +26,8 @@ class Upsert
         Upsert.utc_iso8601 v
       when Date
         v.strftime ISO8601_DATE
+      when Symbol
+        v.to_s
       else
         v
       end

data/lib/upsert/connection/sqlite3.rb

@@ -10,12 +10,8 @@ class Upsert
           't'
         when FalseClass
           'f'
-        when Time, DateTime
-          Upsert.utc_iso8601 v
-        when Date
-          v.strftime ISO8601_DATE
         else
-          v
+          super
         end
       end
     end

data/lib/upsert/merge_function.rb

@@ -46,6 +46,7 @@ class Upsert
       @controller = controller
       @selector_keys = selector_keys
       @setter_keys = setter_keys
+      validate!
       create! unless assume_function_exists
     end
 
@@ -68,5 +69,15 @@ class Upsert
     def column_definitions
       controller.column_definitions
     end
+
+    private
+
+    def validate!
+      possible = column_definitions.map(&:name)
+      invalid = (setter_keys + selector_keys).uniq - possible
+      if invalid.any?
+        raise ArgumentError, "[Upsert] Invalid column(s): #{invalid.map(&:inspect).join(', ')}"
+      end
+    end
   end
 end

data/lib/upsert/merge_function/mysql.rb

@@ -22,6 +22,7 @@ class Upsert
         Upsert.logger.info "[upsert] Creating or replacing database function #{name.inspect} on table #{table_name.inspect} for selector #{selector_keys.map(&:inspect).join(', ')} and setter #{setter_keys.map(&:inspect).join(', ')}"
         selector_column_definitions = column_definitions.select { |cd| selector_keys.include?(cd.name) }
         setter_column_definitions = column_definitions.select { |cd| setter_keys.include?(cd.name) }
+        update_column_definitions = setter_column_definitions.select { |cd| cd.name !~ CREATED_COL_REGEX }
         quoted_name = connection.quote_ident name
         connection.execute "DROP PROCEDURE IF EXISTS #{quoted_name}"
         connection.execute(%{
@@ -50,7 +51,7 @@ class Upsert
                 -- key error. But the handler above will take care of that.
                 IF @count > 0 THEN 
                   -- UPDATE table_name SET b = b_SET WHERE a = a_SEL;
-                  UPDATE #{quoted_table_name} SET #{setter_column_definitions.map(&:to_setter).join(', ')} WHERE #{selector_column_definitions.map(&:to_selector).join(' AND ')};
+                  UPDATE #{quoted_table_name} SET #{update_column_definitions.map(&:to_setter).join(', ')} WHERE #{selector_column_definitions.map(&:to_selector).join(' AND ')};
                 ELSE
                   -- INSERT INTO table_name (a, b) VALUES (k, data);
                   INSERT INTO #{quoted_table_name} (#{setter_column_definitions.map(&:quoted_name).join(', ')}) VALUES (#{setter_column_definitions.map(&:to_setter_value).join(', ')});

data/lib/upsert/merge_function/postgresql.rb

@@ -53,6 +53,7 @@ class Upsert
         Upsert.logger.info "[upsert] Creating or replacing database function #{name.inspect} on table #{table_name.inspect} for selector #{selector_keys.map(&:inspect).join(', ')} and setter #{setter_keys.map(&:inspect).join(', ')}"
         selector_column_definitions = column_definitions.select { |cd| selector_keys.include?(cd.name) }
         setter_column_definitions = column_definitions.select { |cd| setter_keys.include?(cd.name) }
+        update_column_definitions = setter_column_definitions.select { |cd| cd.name !~ CREATED_COL_REGEX }
         first_try = true
         connection.execute(%{
           CREATE OR REPLACE FUNCTION #{name}(#{(selector_column_definitions.map(&:to_selector_arg) + setter_column_definitions.map(&:to_setter_arg)).join(', ')}) RETURNS VOID AS
@@ -62,7 +63,7 @@ class Upsert
           BEGIN
             LOOP
               -- first try to update the key
-              UPDATE #{quoted_table_name} SET #{setter_column_definitions.map(&:to_setter).join(', ')}
+              UPDATE #{quoted_table_name} SET #{update_column_definitions.map(&:to_setter).join(', ')}
                 WHERE #{selector_column_definitions.map(&:to_selector).join(' AND ') };
               IF found THEN
                 RETURN;

data/lib/upsert/merge_function/sqlite3.rb

@@ -3,11 +3,13 @@ class Upsert
     # @private
     module Sqlite3
       attr_reader :quoted_setter_names
+      attr_reader :quoted_update_names
       attr_reader :quoted_selector_names
 
       def initialize(*)
         super
         @quoted_setter_names = setter_keys.map { |k| connection.quote_ident k }
+        @quoted_update_names = setter_keys.select { |k| k !~ CREATED_COL_REGEX }.map { |k| connection.quote_ident k }
         @quoted_selector_names = selector_keys.map { |k| connection.quote_ident k }
       end
 
@@ -18,12 +20,13 @@ class Upsert
       def execute(row)
         bind_setter_values = row.setter.values.map { |v| connection.bind_value v }
         bind_selector_values = row.selector.values.map { |v| connection.bind_value v }
-        
+        bind_update_values = row.setter.select{ |k,v| k !~ CREATED_COL_REGEX }.map { |k,v| connection.bind_value v }
+
         insert_or_ignore_sql = %{INSERT OR IGNORE INTO #{quoted_table_name} (#{quoted_setter_names.join(',')}) VALUES (#{Array.new(bind_setter_values.length, '?').join(',')})}
         connection.execute insert_or_ignore_sql, bind_setter_values
 
-        update_sql = %{UPDATE #{quoted_table_name} SET #{quoted_setter_names.map { |qk| "#{qk}=?" }.join(',')} WHERE #{quoted_selector_names.map { |qk| "#{qk}=?" }.join(' AND ')}}
-        connection.execute update_sql, (bind_setter_values + bind_selector_values)
+        update_sql = %{UPDATE #{quoted_table_name} SET #{quoted_update_names.map { |qk| "#{qk}=?" }.join(',')} WHERE #{quoted_selector_names.map { |qk| "#{qk}=?" }.join(' AND ')}}
+        connection.execute update_sql, (bind_update_values + bind_selector_values)
       end
     end
   end

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "1.1.7"
+  VERSION = "1.2.0"
 end

data/spec/correctness_spec.rb

@@ -46,6 +46,32 @@ describe Upsert do
       u.row(selector, setter)
       Pet.find_by_name_and_gender('Jerry', 'blue').tag_number.should == 777
     end
+
+    # https://github.com/seamusabshere/upsert/issues/18
+    it "uses nil selectors" do
+      Pet.create(name: "Jerry", gender: nil, spiel: "samoyed")
+      u = Upsert.new($conn, :pets)
+      u.row({:name => 'Jerry', gender: nil}, :spiel => 'beagle', :birthday => Time.now)
+      Pet.count.should == 1
+    end
+
+    it "uses nil selectors (another way of checking)" do
+      u = Upsert.new($conn, :pets)
+      now = Time.now
+      assert_creates(Pet, [{:name => 'Jerry', :gender => nil, :spiel => 'beagle', :birthday => now}]) do
+        u.row(name: "Jerry", gender: nil, spiel: "samoyed")
+        u.row({:name => 'Jerry', gender: nil}, :spiel => 'beagle', :birthday => Time.now)
+      end
+    end
+
+    it "tells you if you request a column that doesn't exist" do
+      u = Upsert.new($conn, :pets)
+      lambda { u.row(gibberish: 'ba') }.should raise_error(/invalid col/i)
+      lambda { u.row(name: 'Jerry', gibberish: 'ba') }.should raise_error(/invalid col/i)
+      lambda { u.row({name: 'Jerry'}, gibberish: 'ba') }.should raise_error(/invalid col/i)
+      lambda { u.row({name: 'Jerry'}, gender: 'male', gibberish: 'ba') }.should raise_error(/invalid col/i)
+    end
+
   end
 
   describe "is just as correct as other ways" do

data/spec/database_spec.rb

@@ -66,6 +66,23 @@ describe Upsert do
           upsert.row({:id => jerry.id}, :lovability => 2.0)
         end
       end
+      it "does not set the created_at and created_on columns on update" do
+        task = Task.create :name => 'Clean bathroom'
+        created = task.created_at
+        upsert = Upsert.new $conn, :tasks
+        upsert.row({:id => task.id}, :name => 'Clean kitchen')
+        task.reload
+        task.created_at.should eql task.created_at
+        task.created_on.should eql task.created_on
+      end
+
+      it "converts symbol values to string" do
+        jerry = Pet.create :name => 'Jerry', :gender => 'female'
+        upsert = Upsert.new $conn, :pets
+        assert_creates(Pet, [{:name => 'Jerry', :gender => 'male'}]) do
+          upsert.row({:id => jerry.id}, :gender => :male)
+        end
+      end
     end
     describe :batch do
       it "works for multiple rows (base case)" do
@@ -94,4 +111,4 @@ describe Upsert do
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -107,6 +107,13 @@ class Pet < ActiveRecord::Base
 end
 Pet.auto_upgrade!
 
+class Task < ActiveRecord::Base
+  col :name
+  col :created_at, :type => :datetime
+  col :created_on, :type => :datetime
+end
+Task.auto_upgrade!
+
 require 'zlib'
 require 'benchmark'
 require 'faker'

data/upsert.gemspec

@@ -47,5 +47,6 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'mysql2'
     gem.add_development_dependency 'pg'
     gem.add_development_dependency 'redcarpet' # github-flavored markdown
+    gem.add_development_dependency 'rake'
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 1.1.7
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_inline_schema
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg-hstore
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -206,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -222,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -230,7 +202,20 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -256,6 +241,7 @@ files:
 - lib/upsert/column_definition.rb
 - lib/upsert/column_definition/mysql.rb
 - lib/upsert/column_definition/postgresql.rb
+- lib/upsert/column_definition/sqlite3.rb
 - lib/upsert/connection.rb
 - lib/upsert/connection/Java_ComMysqlJdbc_JDBC4Connection.rb
 - lib/upsert/connection/Java_OrgPostgresqlJdbc4_Jdbc4Connection.rb
@@ -299,27 +285,26 @@ files:
 - upsert.gemspec
 homepage: https://github.com/seamusabshere/upsert
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently creates
   merge functions for MySQL and PostgreSQL; on SQLite3, uses INSERT OR IGNORE.
 test_files: