activerecord-import 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89358f97c9fd1550a1d32d572db5f126d41b6b9c
-  data.tar.gz: e840ba026216f3e0bc60a91b52bb207a558324d0
+  metadata.gz: 25b9f077b6e370081a1c29b59ba3ce50be68659c
+  data.tar.gz: adc5eff35697da10f5a6e3922980dfdd3ea849a6
 SHA512:
-  metadata.gz: de20a46627950ac06773a6b8215b5dd134a3dc0f574407e9980c69dcc45a19b08db80aee089812b83be356913bf8f343737fec8166a0a77356e5fb546ec80e8b
-  data.tar.gz: d1de87a630f697453cfbba9cb83e64b061c157a7d65affc271bfced0e4088afbc0870dcba0dfbc2c2ca1bc8854b137abcb0e8114de0471acb823ba9692df8f1c
+  metadata.gz: c8211cc8ed17997e92e944c1d36533ce501d18401da25df549e700fdd37e4223f5bcef2a342b3c8aa74af31d23d16c932a6e39b2445dba83dc8866575da16196
+  data.tar.gz: 293a3eb933956824ec0fd0b9dfe760ba43d262b3154a5286f3cb33d677ae0c2949effd9c92006dbaa97f5748d97b289bd2483c5b68933ca8e2d8698c18d26111

data/.travis.yml

@@ -14,6 +14,7 @@ env:
     - AR_VERSION=4.2
     - AR_VERSION=5.0
     - AR_VERSION=5.1
+    - AR_VERSION=5.2
 
 matrix:
   include:

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## Changes in 0.23.0
+
+### New Features
+
+* Rename `import` method to `bulk_import and alias to `import`. Thanks
+  to @itay-grudev, @jkowens via \#498.
+* Increment lock_version on duplicate key update. Thanks to @aimerald
+  via \#400.
+
+### Fixes
+
+* Fix import_without_validations_or_callbacks exception if array is empty.
+  Thanks to @doloopwhile via \#508.
+
 ## Changes in 0.22.0
 
 ### New Features
@@ -7,7 +21,9 @@
 
 ### Fixes
 
-* Fix validation logic for recursive import. Thanks to @eric-simonton-sama, @jkowens via
+* Fix validation logic for recursive import. For those on Rails 5.0 and 5.1,
+  this change requires models with polymorphic associations to specify the `inverse_of`
+  argument (See issue #495). Thanks to @eric-simonton-sama, @jkowens via
   \#489.
 
 ## Changes in 0.21.0

data/Gemfile

@@ -2,6 +2,11 @@ source 'https://rubygems.org'
 
 gemspec
 
+version = ENV['AR_VERSION'].to_f
+
+mysql2_version = '0.3.0'
+mysql2_version = '0.4.0' if version >= 4.2
+
 group :development, :test do
   gem 'rubocop', '~> 0.40.0'
   gem 'rake'
@@ -9,7 +14,7 @@ end
 
 # Database Adapters
 platforms :ruby do
-  gem "mysql2",                 "~> 0.3.0"
+  gem "mysql2",                 "~> #{mysql2_version}"
   gem "pg",                     "~> 0.9"
   gem "sqlite3",                "~> 1.3.10"
   gem "seamless_database_pool", "~> 1.0.20"
@@ -27,7 +32,7 @@ end
 gem "factory_girl", "~> 4.2.0"
 gem "timecop"
 gem "chronic"
-gem "mocha"
+gem "mocha", "~> 1.3.0"
 
 # Debugging
 platforms :jruby do
@@ -43,9 +48,7 @@ platforms :ruby do
   gem "rb-readline"
 end
 
-version = ENV['AR_VERSION'] || "4.2"
-
-if version >= "4.0"
+if version >= 4.0
   gem "minitest"
 else
   gem "test-unit"

data/gemfiles/5.0.gemfile

@@ -1,2 +1 @@
 gem 'activerecord', '~> 5.0.0'
-gem 'composite_primary_keys', '~> 9.0'

data/gemfiles/5.1.gemfile

@@ -1,2 +1 @@
 gem 'activerecord', '~> 5.1.0'
-gem 'composite_primary_keys', '~> 10.0'

data/gemfiles/5.2.gemfile

@@ -0,0 +1,2 @@
+gem 'activerecord', '~> 5.2.0.rc1'
+gem 'composite_primary_keys', '~> 11.0.0.rc2'

data/lib/activerecord-import/adapters/abstract_adapter.rb

@@ -45,7 +45,7 @@ module ActiveRecord::Import::AbstractAdapter
       post_sql_statements = []
 
       if supports_on_duplicate_key_update? && options[:on_duplicate_key_update]
-        post_sql_statements << sql_for_on_duplicate_key_update( table_name, options[:on_duplicate_key_update], options[:primary_key] )
+        post_sql_statements << sql_for_on_duplicate_key_update( table_name, options[:on_duplicate_key_update], options[:primary_key], options[:locking_column] )
       elsif options[:on_duplicate_key_update]
         logger.warn "Ignoring on_duplicate_key_update because it is not supported by the database."
       end

data/lib/activerecord-import/adapters/mysql_adapter.rb

@@ -87,10 +87,11 @@ module ActiveRecord::Import::MysqlAdapter
   def sql_for_on_duplicate_key_update( table_name, *args ) # :nodoc:
     sql = ' ON DUPLICATE KEY UPDATE '
     arg = args.first
+    locking_column = args.last
     if arg.is_a?( Array )
-      sql << sql_for_on_duplicate_key_update_as_array( table_name, arg )
+      sql << sql_for_on_duplicate_key_update_as_array( table_name, locking_column, arg )
     elsif arg.is_a?( Hash )
-      sql << sql_for_on_duplicate_key_update_as_hash( table_name, arg )
+      sql << sql_for_on_duplicate_key_update_as_hash( table_name, locking_column, arg )
     elsif arg.is_a?( String )
       sql << arg
     else
@@ -99,20 +100,22 @@ module ActiveRecord::Import::MysqlAdapter
     sql
   end
 
-  def sql_for_on_duplicate_key_update_as_array( table_name, arr ) # :nodoc:
+  def sql_for_on_duplicate_key_update_as_array( table_name, locking_column, arr ) # :nodoc:
     results = arr.map do |column|
       qc = quote_column_name( column )
       "#{table_name}.#{qc}=VALUES(#{qc})"
     end
+    increment_locking_column!(results, table_name, locking_column)
     results.join( ',' )
   end
 
-  def sql_for_on_duplicate_key_update_as_hash( table_name, hsh ) # :nodoc:
+  def sql_for_on_duplicate_key_update_as_hash( table_name, locking_column, hsh ) # :nodoc:
     results = hsh.map do |column1, column2|
       qc1 = quote_column_name( column1 )
       qc2 = quote_column_name( column2 )
       "#{table_name}.#{qc1}=VALUES( #{qc2} )"
     end
+    increment_locking_column!(results, table_name, locking_column)
     results.join( ',')
   end
 
@@ -120,4 +123,10 @@ module ActiveRecord::Import::MysqlAdapter
   def duplicate_key_update_error?(exception) # :nodoc:
     exception.is_a?(ActiveRecord::StatementInvalid) && exception.to_s.include?('Duplicate entry')
   end
+
+  def increment_locking_column!(results, table_name, locking_column)
+    if locking_column.present?
+      results << "#{table_name}.`#{locking_column}`=`#{locking_column}`+1"
+    end
+  end
 end

data/lib/activerecord-import/adapters/postgresql_adapter.rb

@@ -119,7 +119,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
   # Returns a generated ON CONFLICT DO UPDATE statement given the passed
   # in +args+.
   def sql_for_on_duplicate_key_update( table_name, *args ) # :nodoc:
-    arg, primary_key = args
+    arg, primary_key, locking_column = args
     arg = { columns: arg } if arg.is_a?( Array ) || arg.is_a?( String )
     return unless arg.is_a?( Hash )
 
@@ -139,9 +139,9 @@ module ActiveRecord::Import::PostgreSQLAdapter
 
     sql << "#{conflict_target}DO UPDATE SET "
     if columns.is_a?( Array )
-      sql << sql_for_on_duplicate_key_update_as_array( table_name, columns )
+      sql << sql_for_on_duplicate_key_update_as_array( table_name, locking_column, columns )
     elsif columns.is_a?( Hash )
-      sql << sql_for_on_duplicate_key_update_as_hash( table_name, columns )
+      sql << sql_for_on_duplicate_key_update_as_hash( table_name, locking_column, columns )
     elsif columns.is_a?( String )
       sql << columns
     else
@@ -153,20 +153,22 @@ module ActiveRecord::Import::PostgreSQLAdapter
     sql
   end
 
-  def sql_for_on_duplicate_key_update_as_array( table_name, arr ) # :nodoc:
+  def sql_for_on_duplicate_key_update_as_array( table_name, locking_column, arr ) # :nodoc:
     results = arr.map do |column|
       qc = quote_column_name( column )
       "#{qc}=EXCLUDED.#{qc}"
     end
+    increment_locking_column!(results, locking_column)
     results.join( ',' )
   end
 
-  def sql_for_on_duplicate_key_update_as_hash( table_name, hsh ) # :nodoc:
+  def sql_for_on_duplicate_key_update_as_hash( table_name, locking_column, hsh ) # :nodoc:
     results = hsh.map do |column1, column2|
       qc1 = quote_column_name( column1 )
       qc2 = quote_column_name( column2 )
       "#{qc1}=EXCLUDED.#{qc2}"
     end
+    increment_locking_column!(results, locking_column)
     results.join( ',' )
   end
 
@@ -200,4 +202,10 @@ module ActiveRecord::Import::PostgreSQLAdapter
   def supports_setting_primary_key_of_imported_objects?
     true
   end
+
+  def increment_locking_column!(results, locking_column)
+    if locking_column.present?
+      results << "\"#{locking_column}\"=EXCLUDED.\"#{locking_column}\"+1"
+    end
+  end
 end

data/lib/activerecord-import/import.rb

@@ -79,13 +79,14 @@ module ActiveRecord::Import #:nodoc:
 end
 
 class ActiveRecord::Associations::CollectionProxy
-  def import(*args, &block)
-    @association.import(*args, &block)
+  def bulk_import(*args, &block)
+    @association.bulk_import(*args, &block)
   end
+  alias import bulk_import unless respond_to? :import
 end
 
 class ActiveRecord::Associations::CollectionAssociation
-  def import(*args, &block)
+  def bulk_import(*args, &block)
     unless owner.persisted?
       raise ActiveRecord::RecordNotSaved, "You cannot call import unless the parent is saved"
     end
@@ -118,7 +119,7 @@ class ActiveRecord::Associations::CollectionAssociation
         m.public_send "#{reflection.type}=", owner.class.name if reflection.type
       end
 
-      return model_klass.import column_names, models, options
+      return model_klass.bulk_import column_names, models, options
 
     # supports array of hash objects
     elsif args.last.is_a?( Array ) && args.last.first.is_a?(Hash)
@@ -157,7 +158,7 @@ class ActiveRecord::Associations::CollectionAssociation
         end
       end
 
-      return model_klass.import column_names, array_of_attributes, options
+      return model_klass.bulk_import column_names, array_of_attributes, options
 
     # supports empty array
     elsif args.last.is_a?( Array ) && args.last.empty?
@@ -192,11 +193,12 @@ class ActiveRecord::Associations::CollectionAssociation
         end
       end
 
-      return model_klass.import column_names, array_of_attributes, options
+      return model_klass.bulk_import column_names, array_of_attributes, options
     else
       raise ArgumentError, "Invalid arguments!"
     end
   end
+  alias import bulk_import unless respond_to? :import
 end
 
 class ActiveRecord::Base
@@ -447,7 +449,7 @@ class ActiveRecord::Base
     # * num_inserts - the number of insert statements it took to import the data
     # * ids - the primary keys of the imported ids if the adapter supports it, otherwise an empty array.
     # * results - import results if the adapter supports it, otherwise an empty array.
-    def import(*args)
+    def bulk_import(*args)
       if args.first.is_a?( Array ) && args.first.first.is_a?(ActiveRecord::Base)
         options = {}
         options.merge!( args.pop ) if args.last.is_a?(Hash)
@@ -458,23 +460,26 @@ class ActiveRecord::Base
         import_helper(*args)
       end
     end
+    alias import bulk_import unless respond_to? :import
 
     # Imports a collection of values if all values are valid. Import fails at the
     # first encountered validation error and raises ActiveRecord::RecordInvalid
     # with the failed instance.
-    def import!(*args)
+    def bulk_import!(*args)
       options = args.last.is_a?( Hash ) ? args.pop : {}
       options[:validate] = true
       options[:raise_error] = true
 
-      import(*args, options)
+      bulk_import(*args, options)
     end
+    alias import! bulk_import! unless respond_to? :import!
 
     def import_helper( *args )
       options = { validate: true, timestamps: true }
       options.merge!( args.pop ) if args.last.is_a? Hash
       # making sure that current model's primary key is used
       options[:primary_key] = primary_key
+      options[:locking_column] = locking_column if attribute_names.include?(locking_column)
 
       # Don't modify incoming arguments
       on_duplicate_key_update = options[:on_duplicate_key_update]
@@ -656,7 +661,7 @@ class ActiveRecord::Base
 
       array_of_attributes.compact!
 
-      result = if array_of_attributes.empty? || options[:all_or_none] && failed_instances.any?
+      result = if options[:all_or_none] && failed_instances.any?
         ActiveRecord::Import::Result.new([], 0, [], [])
       else
         import_without_validations_or_callbacks( column_names, array_of_attributes, options )
@@ -671,6 +676,8 @@ class ActiveRecord::Base
     # information on +column_names+, +array_of_attributes_ and
     # +options+.
     def import_without_validations_or_callbacks( column_names, array_of_attributes, options = {} )
+      return ActiveRecord::Import::Result.new([], 0, [], []) if array_of_attributes.empty?
+
       column_names = column_names.map(&:to_sym)
       scope_columns, scope_values = scope_attributes.to_a.transpose
 
@@ -802,7 +809,7 @@ class ActiveRecord::Base
 
       associated_objects_by_class.each_value do |associations|
         associations.each_value do |associated_records|
-          associated_records.first.class.import(associated_records, options) unless associated_records.empty?
+          associated_records.first.class.bulk_import(associated_records, options) unless associated_records.empty?
         end
       end
     end

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.22.0".freeze
+    VERSION = "0.23.0".freeze
   end
 end

data/test/models/account.rb

@@ -0,0 +1,3 @@
+class Account < ActiveRecord::Base
+  self.locking_column = :lock
+end

data/test/models/bike_maker.rb

@@ -0,0 +1,7 @@
+module Bike
+  def self.table_name_prefix
+    'bike_'
+  end
+  class Maker < ActiveRecord::Base
+  end
+end

data/test/models/user.rb

@@ -0,0 +1 @@
+class User < ActiveRecord::Base; end

data/test/schema/generic_schema.rb

@@ -159,6 +159,21 @@ ActiveRecord::Schema.define do
     t.string :Features
   end
 
+  create_table :users, force: :cascade do |t|
+    t.string :name, null: false
+    t.integer :lock_version, null: false, default: 0
+  end
+
+  create_table :accounts, force: :cascade do |t|
+    t.string :name, null: false
+    t.integer :lock, null: false, default: 0
+  end
+
+  create_table :bike_makers, force: :cascade do |t|
+    t.string :name, null: false
+    t.integer :lock_version, null: false, default: 0
+  end
+
   add_index :cars, :Name, unique: true
 
   unless ENV["SKIP_COMPOSITE_PK"]

data/test/support/shared_examples/on_duplicate_key_update.rb

@@ -5,6 +5,213 @@ def should_support_basic_on_duplicate_key_update
     macro(:perform_import) { raise "supply your own #perform_import in a context below" }
     macro(:updated_topic) { Topic.find(@topic.id) }
 
+    context "with lock_version upsert" do
+      describe 'optimistic lock' do
+        it 'lock_version upsert after on_duplcate_key_update by model' do
+          users = [
+            User.new(name: 'Salomon'),
+            User.new(name: 'Nathan')
+          ]
+          User.import(users)
+          assert User.count == users.length
+          User.all.each do |user|
+            assert_equal 0, user.lock_version
+          end
+          updated_users = User.all.map do |user|
+            user.name += ' Rothschild'
+            user
+          end
+          User.import(updated_users, on_duplicate_key_update: [:name])
+          assert User.count == updated_users.length
+          User.all.each_with_index do |user, i|
+            assert_equal user.name, users[i].name + ' Rothschild'
+            assert_equal 1, user.lock_version
+          end
+        end
+
+        it 'lock_version upsert after on_duplcate_key_update by array' do
+          users = [
+            User.new(name: 'Salomon'),
+            User.new(name: 'Nathan')
+          ]
+          User.import(users)
+          assert User.count == users.length
+          User.all.each do |user|
+            assert_equal 0, user.lock_version
+          end
+
+          columns = [:id, :name]
+          updated_values = User.all.map do |user|
+            user.name += ' Rothschild'
+            [user.id, user.name]
+          end
+          User.import(columns, updated_values, on_duplicate_key_update: [:name])
+          assert User.count == updated_values.length
+          User.all.each_with_index do |user, i|
+            assert_equal user.name, users[i].name + ' Rothschild'
+            assert_equal 1, user.lock_version
+          end
+        end
+
+        it 'lock_version upsert after on_duplcate_key_update by hash' do
+          users = [
+            User.new(name: 'Salomon'),
+            User.new(name: 'Nathan')
+          ]
+          User.import(users)
+          assert User.count == users.length
+          User.all.each do |user|
+            assert_equal 0, user.lock_version
+          end
+          updated_values = User.all.map do |user|
+            user.name += ' Rothschild'
+            { id: user.id, name: user.name }
+          end
+          User.import(updated_values, on_duplicate_key_update: [:name])
+          assert User.count == updated_values.length
+          User.all.each_with_index do |user, i|
+            assert_equal user.name, users[i].name + ' Rothschild'
+            assert_equal 1, user.lock_version
+          end
+        end
+
+        it 'upsert optimistic lock columns other than lock_version by model' do
+          accounts = [
+            Account.new(name: 'Salomon'),
+            Account.new(name: 'Nathan')
+          ]
+          Account.import(accounts)
+          assert Account.count == accounts.length
+          Account.all.each do |user|
+            assert_equal 0, user.lock
+          end
+          updated_accounts = Account.all.map do |user|
+            user.name += ' Rothschild'
+            user
+          end
+          Account.import(updated_accounts, on_duplicate_key_update: [:id, :name])
+          assert Account.count == updated_accounts.length
+          Account.all.each_with_index do |user, i|
+            assert_equal user.name, accounts[i].name + ' Rothschild'
+            assert_equal 1, user.lock
+          end
+        end
+
+        it 'upsert optimistic lock columns other than lock_version by array' do
+          accounts = [
+            Account.new(name: 'Salomon'),
+            Account.new(name: 'Nathan')
+          ]
+          Account.import(accounts)
+          assert Account.count == accounts.length
+          Account.all.each do |user|
+            assert_equal 0, user.lock
+          end
+
+          columns = [:id, :name]
+          updated_values = Account.all.map do |user|
+            user.name += ' Rothschild'
+            [user.id, user.name]
+          end
+          Account.import(columns, updated_values, on_duplicate_key_update: [:name])
+          assert Account.count == updated_values.length
+          Account.all.each_with_index do |user, i|
+            assert_equal user.name, accounts[i].name + ' Rothschild'
+            assert_equal 1, user.lock
+          end
+        end
+
+        it 'upsert optimistic lock columns other than lock_version by hash' do
+          accounts = [
+            Account.new(name: 'Salomon'),
+            Account.new(name: 'Nathan')
+          ]
+          Account.import(accounts)
+          assert Account.count == accounts.length
+          Account.all.each do |user|
+            assert_equal 0, user.lock
+          end
+          updated_values = Account.all.map do |user|
+            user.name += ' Rothschild'
+            { id: user.id, name: user.name }
+          end
+          Account.import(updated_values, on_duplicate_key_update: [:name])
+          assert Account.count == updated_values.length
+          Account.all.each_with_index do |user, i|
+            assert_equal user.name, accounts[i].name + ' Rothschild'
+            assert_equal 1, user.lock
+          end
+        end
+
+        it 'update the lock_version of models separated by namespaces by model' do
+          makers = [
+            Bike::Maker.new(name: 'Yamaha'),
+            Bike::Maker.new(name: 'Honda')
+          ]
+          Bike::Maker.import(makers)
+          assert Bike::Maker.count == makers.length
+          Bike::Maker.all.each do |maker|
+            assert_equal 0, maker.lock_version
+          end
+          updated_makers = Bike::Maker.all.map do |maker|
+            maker.name += ' bikes'
+            maker
+          end
+          Bike::Maker.import(updated_makers, on_duplicate_key_update: [:name])
+          assert Bike::Maker.count == updated_makers.length
+          Bike::Maker.all.each_with_index do |maker, i|
+            assert_equal maker.name, makers[i].name + ' bikes'
+            assert_equal 1, maker.lock_version
+          end
+        end
+        it 'update the lock_version of models separated by namespaces by array' do
+          makers = [
+            Bike::Maker.new(name: 'Yamaha'),
+            Bike::Maker.new(name: 'Honda')
+          ]
+          Bike::Maker.import(makers)
+          assert Bike::Maker.count == makers.length
+          Bike::Maker.all.each do |maker|
+            assert_equal 0, maker.lock_version
+          end
+
+          columns = [:id, :name]
+          updated_values = Bike::Maker.all.map do |maker|
+            maker.name += ' bikes'
+            [maker.id, maker.name]
+          end
+          Bike::Maker.import(columns, updated_values, on_duplicate_key_update: [:name])
+          assert Bike::Maker.count == updated_values.length
+          Bike::Maker.all.each_with_index do |maker, i|
+            assert_equal maker.name, makers[i].name + ' bikes'
+            assert_equal 1, maker.lock_version
+          end
+        end
+
+        it 'update the lock_version of models separated by namespaces by hash' do
+          makers = [
+            Bike::Maker.new(name: 'Yamaha'),
+            Bike::Maker.new(name: 'Honda')
+          ]
+          Bike::Maker.import(makers)
+          assert Bike::Maker.count == makers.length
+          Bike::Maker.all.each do |maker|
+            assert_equal 0, maker.lock_version
+          end
+          updated_values = Bike::Maker.all.map do |maker|
+            maker.name += ' bikes'
+            { id: maker.id, name: maker.name }
+          end
+          Bike::Maker.import(updated_values, on_duplicate_key_update: [:name])
+          assert Bike::Maker.count == updated_values.length
+          Bike::Maker.all.each_with_index do |maker, i|
+            assert_equal maker.name, makers[i].name + ' bikes'
+            assert_equal 1, maker.lock_version
+          end
+        end
+      end
+    end
+
     context "with :on_duplicate_key_update" do
       describe "argument safety" do
         it "should not modify the passed in :on_duplicate_key_update array" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -74,6 +74,7 @@ files:
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
+- gemfiles/5.2.gemfile
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
@@ -114,7 +115,9 @@ files:
 - test/jdbcmysql/import_test.rb
 - test/jdbcpostgresql/import_test.rb
 - test/jdbcsqlite3/import_test.rb
+- test/models/account.rb
 - test/models/alarm.rb
+- test/models/bike_maker.rb
 - test/models/book.rb
 - test/models/car.rb
 - test/models/chapter.rb
@@ -127,6 +130,7 @@ files:
 - test/models/rule.rb
 - test/models/tag.rb
 - test/models/topic.rb
+- test/models/user.rb
 - test/models/vendor.rb
 - test/models/widget.rb
 - test/mysql2/import_test.rb
@@ -198,7 +202,9 @@ test_files:
 - test/jdbcmysql/import_test.rb
 - test/jdbcpostgresql/import_test.rb
 - test/jdbcsqlite3/import_test.rb
+- test/models/account.rb
 - test/models/alarm.rb
+- test/models/bike_maker.rb
 - test/models/book.rb
 - test/models/car.rb
 - test/models/chapter.rb
@@ -211,6 +217,7 @@ test_files:
 - test/models/rule.rb
 - test/models/tag.rb
 - test/models/topic.rb
+- test/models/user.rb
 - test/models/vendor.rb
 - test/models/widget.rb
 - test/mysql2/import_test.rb