bulk_update 1.1.1 → 1.1.2

data/README.md

@@ -86,6 +86,9 @@ All new, changed and deleted records are handled by ActiveRecord. This ensures,
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## Copyright
 
-Copyright (c) 2012 - 2013 Philip Kurmann. See LICENSE for details.
+## License
+This project is licenced under the MIT license.
+
+## Author
+Philip Kurmann (philip (at) kman.ch)

data/lib/bulk_update/active_record_inflections.rb

@@ -196,7 +196,8 @@ module BulkUpdate
       end
 
       # Generate and execute SQL-Statement
-      condition = "#{conditions.join(' AND ')} AND (#{conditions2.join(' OR ')})"
+      condition = conditions.join(' AND ')
+      condition += " AND (#{conditions2.join(' OR ')})" unless conditions2.blank?
       compare_columns = attribute_names.select { |e| e != 'id' }.map { |e| "#{compare_table}.#{e}" }.join(', ')
       sql = "SELECT #{model.table_name}.id, #{compare_columns} FROM #{model.table_name}, #{compare_table} WHERE #{condition}"
       results = ActiveRecord::Base.connection.execute sql
@@ -238,8 +239,8 @@ module BulkUpdate
       end
 
       # Generate and execute SQL-Statement
-      condition = conditions.join(' AND ') unless conditions.blank?
-      condition2 = conditions2.join(' AND ') unless conditions2.blank?
+      condition = conditions.join(' AND ')
+      condition2 = conditions2.join(' AND ')
       sql = "SELECT id, #{key} FROM #{model.table_name} WHERE #{condition} #{'AND' unless conditions.blank?} #{model.table_name}.#{key} NOT IN " +
             "(SELECT #{key} FROM #{compare_table} #{'WHERE' unless conditions2.blank?} #{condition2})"
       results = ActiveRecord::Base.connection.execute sql

data/lib/bulk_update/version.rb

@@ -1,3 +1,3 @@
 module BulkUpdate
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulk_update
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord