seeder 0.1.0 → 0.1.1

data/lib/seeder.rb

@@ -1,6 +1,10 @@
 class Seeder
 
   class << self
+    QUOTING = {
+      "ActiveRecord::ConnectionAdapters::MysqlAdapter"  => "`",
+      "ActiveRecord::ConnectionAdapters::Mysql2Adapter" => "`"
+    }
 
     def existing_data_keys(ar_model)
       keys = @primary_keys[ar_model.name]
@@ -25,17 +29,29 @@ class Seeder
       end
     end
 
+    def quote(value)
+      q = QUOTING[ActiveRecord::Base.connection.class.to_s] || "'"
+      "#{q}#{value}#{q}"
+    end
+
     def add_new_or_changed_data(ar_model)
       keys = @primary_keys[ar_model.name]
       find_method = "find_by_#{keys.join('_and_')}"
+
       @data[ar_model.name].collect do |attributes|
         relevant_keys = attributes.keys & ar_model.column_names.map(&:to_sym)
         existing = ar_model.send(find_method, *attributes.values_at(*keys))
-        next if existing && attributes.values_at(*relevant_keys) == existing.attributes.symbolize_keys.values_at(*relevant_keys)
         values = attributes.values_at(*relevant_keys)
-        %{
-          INSERT INTO #{ar_model.table_name} (#{relevant_keys.map{|col| "`#{col}`"}.join(', ')}) VALUES (#{values.map{|val| value_to_sql(val)}.join(', ')}) ON DUPLICATE KEY UPDATE #{relevant_keys.map{|col| "`#{col}` = VALUES(`#{col}`)"}.join(', ')}
-        }
+
+        if existing
+         updates    = attributes.slice(*relevant_keys).map { |k,v| "#{quote(k)} = #{value_to_sql(v)}" }.join(", ")
+          conditions = keys.map { |k| "#{quote(k)} = #{value_to_sql(existing.send(k))}" }.join(" AND ")
+          %(UPDATE #{ar_model.table_name} SET #{updates} WHERE #{conditions})
+        else
+          columns = relevant_keys.join(", ")
+          inserts = attributes.slice(*relevant_keys).values.map { |v| value_to_sql(v) }.join(", ")
+          %(INSERT INTO #{ar_model.table_name} (#{columns}) VALUES (#{inserts}))
+        end
       end.compact
     end
 

data/lib/seeder/version.rb

@@ -1,3 +1,3 @@
 class Seeder
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seeder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000Z
+date: 2011-09-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152871700 !ruby/object:Gem::Requirement
+  requirement: &2166523000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152871700
+  version_requirements: *2166523000
 description: Keep your app's seed data in one file and update it easily, while respecting
   key constraints
 email: bsingh@wegowise.com
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Seed your data