upsert 0.3.3 → 0.3.4

data/CHANGELOG

@@ -1,3 +1,13 @@
+0.3.4 / 2012-07-03
+
+* Bug fixes
+
+  * Allow upserting by auto-increment primary key (thanks @atandrau https://github.com/seamusabshere/upsert/issues/3)
+
+* Enhancements
+
+  * Make document an optional argument
+
 0.3.3 / 2012-06-26
 
 * Bug fixes

data/README.md

@@ -54,9 +54,10 @@ Pull requests for any of these would be greatly appreciated:
 
 1. Fix SQLite tests.
 2. For PG, be smarter about when you create functions - try to re-use them within a connection.
-3. Provide `require 'upsert/debug'` that will make sure you are selecting on columns that have unique indexes
-4. Make `Upsert` instances accept arbitrary columns, which is what people probably expect.
-5. Naming suggestions: should "document" be called "setters" or "attributes"?
+3. Provide optional SQL logging.
+4. Provide `require 'upsert/debug'` that will make sure you are selecting on columns that have unique indexes
+5. Make `Upsert` instances accept arbitrary columns, which is what people probably expect.
+6. Naming suggestions: should "document" be called "setters" or "attributes"?
 
 ## Real-world usage
 

data/lib/upsert.rb

@@ -94,7 +94,7 @@ class Upsert
   #   upsert = Upsert.new Pet.connection, Pet.table_name
   #   upsert.row({:name => 'Jerry'}, :breed => 'beagle')
   #   upsert.row({:name => 'Pierre'}, :breed => 'tabby')
-  def row(selector, document)
+  def row(selector, document = {})
     buffer.push Row.new(self, selector, document)
     if sql = chunk
       execute sql

data/lib/upsert/active_record_upsert.rb

@@ -1,6 +1,6 @@
 class Upsert
   module ActiveRecordUpsert
-    def upsert(selector, document)
+    def upsert(selector, document = {})
       ActiveRecord::Base.connection_pool.with_connection do |c|
         upsert = Upsert.new c, table_name
         upsert.row selector, document

data/lib/upsert/pg_connection/column_definition.rb

@@ -4,41 +4,16 @@ class Upsert
     # activerecord-3.2.5/lib/active_record/connection_adapters/postgresql_adapter.rb#column_definitions
     class ColumnDefinition
       class << self
-        def auto_increment_primary_key(connection, table_name)
-          res = connection.exec <<-EOS
-SELECT attr.attname, seq.relname
-FROM pg_class      seq,
-   pg_attribute  attr,
-   pg_depend     dep,
-   pg_namespace  name,
-   pg_constraint cons
-WHERE seq.oid           = dep.objid
-AND seq.relkind       = 'S'
-AND attr.attrelid     = dep.refobjid
-AND attr.attnum       = dep.refobjsubid
-AND attr.attrelid     = cons.conrelid
-AND attr.attnum       = cons.conkey[1]
-AND cons.contype      = 'p'
-AND dep.refobjid      = '#{connection.quote_ident(table_name.to_s)}'::regclass
-EOS
-          if hit = res.first
-            hit['attname']
-          end
-        end
-
         def all(connection, table_name)
-          auto_increment_primary_key = auto_increment_primary_key(connection, table_name)
           res = connection.exec <<-EOS
 SELECT a.attname AS name, format_type(a.atttypid, a.atttypmod) AS sql_type, d.adsrc AS default
 FROM pg_attribute a LEFT JOIN pg_attrdef d
   ON a.attrelid = d.adrelid AND a.attnum = d.adnum
 WHERE a.attrelid = '#{connection.quote_ident(table_name.to_s)}'::regclass
- AND a.attnum > 0 AND NOT a.attisdropped
+  AND a.attnum > 0 AND NOT a.attisdropped
 ORDER BY a.attnum
 EOS
-          res.reject do |row|
-            row['name'] == auto_increment_primary_key
-          end.map do |row|
+          res.map do |row|
             new connection, row['name'], row['sql_type'], row['default']
           end
         end

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/shared/database.rb

@@ -36,7 +36,6 @@ shared_examples_for 'is a database with an upsert trick' do
       end
       Pet.where(:gender => 'male').count.must_equal 0
     end
-
     it "works for a single row with implicit nulls" do
       upsert = Upsert.new connection, :pets
       assert_creates(Pet, [{:name => 'Inky', :gender => nil}]) do
@@ -44,6 +43,13 @@ shared_examples_for 'is a database with an upsert trick' do
         upsert.row({:name => 'Inky'}, {})
       end
     end
+    it "works for a single row with empty document" do
+      upsert = Upsert.new connection, :pets
+      assert_creates(Pet, [{:name => 'Inky', :gender => nil}]) do
+        upsert.row(:name => 'Inky')
+        upsert.row(:name => 'Inky')
+      end
+    end
     it "works for a single row with explicit nulls" do
       upsert = Upsert.new connection, :pets
       assert_creates(Pet, [{:name => 'Inky', :gender => nil}]) do
@@ -51,6 +57,13 @@ shared_examples_for 'is a database with an upsert trick' do
         upsert.row({:name => 'Inky'}, {:gender => nil})
       end
     end
+    it "works with ids" do
+      jerry = Pet.create :name => 'Jerry', :lovability => 1.0
+      upsert = Upsert.new connection, :pets
+      assert_creates(Pet, [{:name => 'Jerry', :lovability => 2.0}]) do
+        upsert.row({:id => jerry.id}, :lovability => 2.0)
+      end
+    end
   end
   describe :batch do
     it "works for multiple rows (base case)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3