activerecord-import 0.17.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5482a79b112f9689eee0261baa906028abd8575f
-  data.tar.gz: 2f3e76132e6110a5ed17db800f173b5291ddfe8d
+SHA256:
+  metadata.gz: 4c61743fafaad0de04ccf2c6bff4439fe66aed03e951e5c42e4f7926cf8dac39
+  data.tar.gz: c58d8992957e546b73bb7f7b90eaf2a741f007d2109a16db0e3b3d71b376e1da
 SHA512:
-  metadata.gz: 509fe999b0343506f4b1263909d24079394d82d8d3aa16fa5210f35a88b92f40954141949ee7a5f979a81f6105838f0471c5c8cdcfa75a30a5abd38fc96cd1f8
-  data.tar.gz: 517d7de4678ddf9361647f18d08d95c2256e244ae3e6241413abde6b83992e62f4640279c42abdea8bbc710855800840fd2bf941bdca1b447693f2d82cbaa987
+  metadata.gz: 98638b63235eae1c16f27d3be932b8ce4e8f236b24350766792a4fc563d199cb1d048d25efa5d22abf3a21017fa07b9474c3168a4be6c1ba5aaa6e0843d584a3
+  data.tar.gz: 5c62bed2684f1b6d60d7e26b8ad13c6b7173a64835eeca9474082122425ab1f340f9063868224eda2539878210887701022e1ff6e6a37593872682bf90768d3a

data/.gitignore

@@ -24,6 +24,7 @@ pkg
 log/*.log
 test.db
 test/database.yml
+benchmarks/log/
 
 .ruby-*
 .bundle/

data/.travis.yml

@@ -1,33 +1,52 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.2.4
+  - 2.5.8
 
 env:
   global:
     # https://github.com/discourse/discourse/blob/master/.travis.yml
     - RUBY_GC_MALLOC_LIMIT=50000000
   matrix:
-    - AR_VERSION=3.2
-    - AR_VERSION=4.0
-    - AR_VERSION=4.1
-    - AR_VERSION=4.2
-    - AR_VERSION=5.0
+    - AR_VERSION=5.1
+    - AR_VERSION=5.2
+    - AR_VERSION=6.0
+    - AR_VERSION=6.1
 
 matrix:
   include:
-    - rvm: jruby-9.1.7.0
+    - rvm: 2.3.8
+      env: AR_VERSION=3.2
+    - rvm: 2.3.8
+      env: AR_VERSION=4.0
+    - rvm: 2.3.8
+      env: AR_VERSION=4.1
+    - rvm: 2.3.8
       env: AR_VERSION=4.2
-      before_install:
-        - gem update --system
-
-      script:
-        - bundle exec rake test:jdbcsqlite3
-        - bundle exec rake test:jdbcmysql
-        - bundle exec rake test:jdbcpostgresql
+    - rvm: 2.3.8
+      env: AR_VERSION=5.0
 
   fast_finish: true
 
+addons:
+  postgresql: "10"
+  apt:
+    sources:
+      - travis-ci/sqlite3
+      - mysql-5.7-trusty
+    packages:
+      - sqlite3
+      - mysql-server
+      - mysql-client
+      - postgresql-10-postgis-2.4
+
+before_install:
+  - sudo apt-get update
+  - gem update --system
+  - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
+  - sudo mysql_upgrade
+  - sudo service mysql restart   
+
 before_script:
   - mysql -e 'create database activerecord_import_test;'
   - psql -c 'create database activerecord_import_test;' -U postgres
@@ -36,14 +55,6 @@ before_script:
   - psql -c 'create extension if not exists "uuid-ossp";' -U postgres
   - cp test/travis/database.yml test/database.yml
 
-addons:
-  postgresql: "9.4"
-  apt:
-    sources:
-      - travis-ci/sqlite3
-    packages:
-      - sqlite3
-
 script:
   - bundle exec rake test:mysql2
   - bundle exec rake test:mysql2_makara
@@ -56,4 +67,10 @@ script:
   - bundle exec rake test:sqlite3
   - bundle exec rubocop
 
-sudo: false
+dist: xenial
+
+services:
+  - mysql
+  - postgresql
+
+sudo: required

data/CHANGELOG.md

@@ -1,10 +1,324 @@
+## Changes in 1.1.0
+
+### New Features
+
+*  Add batch progress reporting. Thanks to @gee-forr via \##729.
+
+## Changes in 1.0.8
+
+### Fixes
+
+* Use correct method for clearing query cache. Thanks to @EtienneDepaulis via \##719.
+
+## Changes in 1.0.7
+
+### New Features
+
+* Use @@max_allowed_packet session variable instead of querying SHOW VARIABLES. Thanks to @diclophis via \#706.
+* Add option :track_validation_failures. When this is set to true, failed_instances will be an array of arrays, with each inner array having the form [:index_in_dataset, :object_with_errors]. Thanks to @rorymckinley  via \#684.
+
+### Fixes
+
+* Prevent mass-assignment errors in Rails strict mode. Thanks to @diclophis via \##709.
+
+## Changes in 1.0.6
+
+### Fixes
+
+* Handle after_initialize callbacks. Thanks to @AhMohsen46 via \#691 and
+  \#692.
+* Fix regression introduced in 1.0.4. Explicity allow adapters to
+  support on duplicate key update. Thanks to @dsobiera, @jkowens via \#696.
+
+## Changes in 1.0.5
+
+### Fixes
+
+* Allow serialized attributes to be returned from import. Thanks to @timanovsky, @jkowens via \#660.
+* Return ActiveRecord::Connection from
+  ActiveREcord::Base#establish_connection. Thanks to @reverentF via
+\#663.
+* Support PostgreSQL array. Thanks to @ujihisa via \#669.
+* Skip loading association ids when column changed. Thanks to @Aristat
+  via \#673.
+
+## Changes in 1.0.4
+
+### Fixes
+
+* Use prepend pattern for ActiveRecord::Base#establish_connection patching. Thanks to @dombesz via \#648.
+* Fix NoMethodError when using PostgreSQL ENUM types. Thanks to @sebcoetzee via \#651.
+* Fix issue updating optimistic lock in Postgres. Thanks to @timanovsky
+  via \#656.
+
+## Changes in 1.0.3
+
+### New Features
+
+* Add support for ActiveRecord 6.1.0.alpha. Thanks to @imtayadeway via
+  \#642.
+
+### Fixes
+
+* Return an empty array for results instead of nil when importing empty
+  array. Thanks to @gyfis via \#636.
+
+## Changes in 1.0.2
+
+### New Features
+
+* Add support for CockroachDB adapter. Thanks to @willie via \#605.
+* Add support for ActiveRecord 6.0.0.rc1. Thanks to @madeindjs, @bill-filler,
+  @jkowens via \#619, \#623.
+
+### Fixes
+
+* Fixes NoMethodError when attempting to use nil logger. Thanks to @MattMecel,
+  @khiav22357.
+* Fix issue validating STI models. Thanks to @thejbsmith, @jkowens via
+  \#626.
+
+## Changes in 1.0.1
+
+### Fixes
+
+* Raise an error with a helpful message if array of values exceeds the number of
+  columns for a table. Thanks to @golddranks via \#589.
+* Properly check if model responds to import before creating alias.
+  Thanks to @jcw- via \#591.
+* No longer pass :returning option to child associations on recursive
+  import. Thanks to @dmitriy-kiriyenko via \#595.
+* Fix import issue for models with Postgresql json/jsonb fields. Thanks
+  to @stokarenko via \#594.
+* Fix issue importing models with timestamps that contain timezone
+  information. Thaks to @dekaikiwi, @jkowens via \#598.
+* Ignore :no_returning when using :recursive option. Thanks to @dgollahon, @jkowens
+  via \#599.
+
+## Changes in 1.0.0
+
+### New Features
+
+* Move ActiveRecord::Dirty changes to previous_changes after import.
+  Thanks to @stokarenko via \#584.
+
+### Breaking Changes
+
+* Previously :on_duplicate_key_update was enabled by default for MySQL.
+  The update timestamp columns (updated_at, updated_on) would be updated
+  on duplicate key. This was behavior is inconsistent with the other database
+  adapters and could also be considered surprising. Going forward it must
+  be explicitly enabled. See \#548.
+
+## Changes in 0.28.2
+
+### Fixes
+
+* Fix issue where validations where not working in certain scenarios.
+  Thanks to @CASIXx1 via \#579.
+
+## Changes in 0.28.1
+
+### Fixes
+
+* Fix issue where ActiveRecord presence validations were being mutated.
+  Limited custom presence validation to bulk imports.
+
+## Changes in 0.28.0
+
+### New Features
+
+* Allow updated timestamps to be manually set.Thanks to @Rob117, @jkowens via \#570.
+
+### Fixes
+
+* Fix validating presence of belongs_to associations. Existence
+  of the parent record is not validated, but the foreign key field
+  cannot be empty. Thanks to @Rob117, @jkowens via \#575.
+
+## Changes in 0.27.0
+
+### New Features
+
+* Add "secret" option validate_uniqueness to enable uniqueness
+  validators when validating import. This is not a recommended
+  approach (See #228), but is being added back in for projects
+  that depended on this feature. Thanks to @jkowens via \#554.
+
+## Changes in 0.26.0
+
+### New Features
+
+* Add  on_duplicate_key_update for SQLite. Thanks to @jkowens via \#542.
+* Add option to update all fields on_duplicate_key_update. Thanks to @aimerald, @jkowens via \#543.
+
+### Fixes
+
+* Handle deeply frozen options hashes. Thanks to @jturkel via \#546.
+* Switch from FactoryGirl to FactoryBot. Thanks to @koic via \#547.
+* Allow import to work with ProxySQL. Thanks to @GregFarrell via \#550.
+
+## Changes in 0.25.0
+
+### New Features
+
+* Add support for makara_postgis adapter. Thanks to @chadwilken via \#527.
+* Skip validating presence of belongs_to associations. Thanks to @Sohair63, @naiyt, @jkowens via \#528.
+
+### Fixes
+
+* Add missing require for ActiveSupport.on_load. Thanks to @onk via \#529.
+* Support setting attribute values in before_validation callbacks.
+  Thanks to @SirRawlins, @jkowens via \#531.
+* Ignore virtual columns. Thanks to @dbourguignon, @jkowens via \#530.
+
+## Changes in 0.24.0
+
+### Fixes
+
+* Use the association primary key when importing. Thanks to @dpogue via \#512.
+* Allow association ids to be updated. Thanks to @Aristat via \#515.
+
+## 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 \#500.
+
+### Fixes
+
+* Fix import_without_validations_or_callbacks exception if array is empty.
+  Thanks to @doloopwhile via \#508.
+
+## Changes in 0.22.0
+
+### New Features
+
+* Add support for importing hashes thru a has many association. Thanks
+  to @jkowens via \#483.
+
+### Fixes
+
+* 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
+
+### New Features
+
+* Allow SQL subqueries (objects that respond to .to_sql) to be passed as values. Thanks
+  to @jalada, @jkowens via \#471
+* Raise an ArgumentError when importing an array of hashes if any of the
+  hash objects have different keys. Thanks to @mbell697 via \#465.
+
+### Fixes
+
+* Fix issue loading incorrect foreign key value when syncing belongs_to
+  associations with custom foreign key columns. Thanks to @marcgreenstock, @jkowens via \#470.
+* Fix issue importing models with polymorphic belongs_to associations.
+  Thanks to @zorab47, @jkowens via \#476.
+* Fix issue importing STI models with ActiveRecord 4.0. Thanks to
+  @kazuki-st, @jkowens via \#478.
+
+## Changes in 0.20.2
+
+### Fixes
+
+* Unscope model when synchronizing with database. Thanks to @indigoviolet via \#455.
+
+## Changes in 0.20.1
+
+### Fixes
+
+* Prevent :on_duplicate_key_update args from being modified. Thanks to @joshuamcginnis, @jkowens via \#451.
+
+## Changes in 0.20.0
+
+### New Features
+
+* Allow returning columns to be specified for PostgreSQL. Thanks to
+  @tjwp via \#433.
+
+### Fixes
+
+* Fixes an issue when bypassing uniqueness validators. Thanks to @vmaxv via \#444.
+* For AR < 4.2, prevent type casting for binary columns on Postgresql. Thanks to @mwalsher via \#446.
+* Fix issue logging class name on import. Thanks to @sophylee, @jkowens via \#447.
+* Copy belongs_to association id to foreign key column before importing. Thanks to @jkowens via \#448.
+* Reset model instance on validate. Thanks to @vmaxv via \#449.
+
+## Changes in 0.19.1
+
+### Fixes
+
+* Fix a regression where models weren't properly being marked clean. Thanks to @tjwp via \#434.
+* Raise ActiveRecord::Import::ValueSetTooLargeError when a record being inserted exceeds the
+  `max_allowed_packet` for MySQL. Thanks to @saizai, @jkowens via \#437.
+* Fix issue concatenating column names array with primary key. Thanks to @keeguon via \#440.
+
+## Changes in 0.19.0
+
+### New Features
+
+* For PostgreSQL, add option to set WHERE condition in conflict_action. Thanks to
+  @Saidbek via \#423.
+
+### Fixes
+
+* Fix issue importing saved records with serialized fields. Thanks to
+  @Andreis13, @jkowens via \#425.
+* Fix issue importing records that have columns defined with default values
+  that are functions or expressions. Thanks to @Andreis13, @jkowens via \#428.
+
+## Changes in 0.18.3
+
+### Fixes
+
+* Set models new_record attribute to false when importing with
+  :on_duplicate_key_ignore. Thanks to @nijikon, @jkowens via \#416.
+
+## Changes in 0.18.2
+
+### Fixes
+
+* Enable custom validate callbacks when validating import. Thanks to @afn via \#410.
+* Prevent wrong IDs being set on models when using :on_duplicate_key_ignore.
+  Thanks to @afn, @jkowens via \#412.
+
+## Changes in 0.18.1
+
+### Fixes
+
+* Fix to enable validation callbacks (before_validation,
+  after_validation). Thanks to @sinsoku, @jkowens via \#406.
+
+## Changes in 0.18.0
+
+### New Features
+
+* Uniqueness validation is bypassed when validating models since
+  it cannot be guaranteed if there are duplicates in a batch.
+  Thanks to @jkowens via \#301.
+* Allow for custom timestamp columns. Thanks to @mojidabckuu, @jkowens
+  via \#401.
+
+### Fixes
+
+* Fix ActiveRecord 5 issue coercing boolean values when serializing
+  for the database. Thanks to @rjrobinson, @jkowens via \#403.
+
 ## Changes in 0.17.2
 
 ### Fixes
 
 * Fix issue where PostgreSQL cannot recognize columns if names
   include mixed case characters. Thanks to @hugobgranja via \#379.
-* Fix an issue for ActiveRecord 5 where serialized fields with 
+* Fix an issue for ActiveRecord 5 where serialized fields with
   default values were not being typecast. Thanks to @whistlerbrk,
   @jkowens via \#386.
 * Add option :force_single_insert for MySQL to make sure a single

data/Gemfile

@@ -2,32 +2,42 @@ 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
+mysql2_version = '0.5.0' if version >= 6.1
+sqlite3_version = '1.3.0'
+sqlite3_version = '1.4.0' if version >= 6.0
+pg_version = '0.9'
+pg_version = '1.1' if version >= 6.1
+
 group :development, :test do
-  gem 'rubocop', '~> 0.38.0'
+  gem 'rubocop', '~> 0.40.0'
   gem 'rake'
 end
 
 # Database Adapters
 platforms :ruby do
-  gem "mysql2",                 "~> 0.3.0"
-  gem "pg",                     "~> 0.9"
-  gem "sqlite3",                "~> 1.3.10"
-  gem "seamless_database_pool", "~> 1.0.18"
+  gem "mysql2",                 "~> #{mysql2_version}"
+  gem "pg",                     "~> #{pg_version}"
+  gem "sqlite3",                "~> #{sqlite3_version}"
+  gem "seamless_database_pool", "~> 1.0.20"
 end
 
 platforms :jruby do
   gem "jdbc-mysql"
   gem "jdbc-postgres"
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
+  gem "activerecord-jdbcsqlite3-adapter",    "~> 1.3"
+  gem "activerecord-jdbcmysql-adapter",      "~> 1.3"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 1.3"
 end
 
 # Support libs
-gem "factory_girl", "~> 4.2.0"
+gem "factory_bot"
 gem "timecop"
 gem "chronic"
-gem "mocha"
+gem "mocha", "~> 1.3.0"
 
 # Debugging
 platforms :jruby do
@@ -40,11 +50,11 @@ end
 
 platforms :ruby do
   gem "pry-byebug"
+  gem "pry", "~> 0.12.0"
+  gem "rb-readline"
 end
 
-version = ENV['AR_VERSION'] || "4.2"
-
-if version >= "4.0"
+if version >= 4.0
   gem "minitest"
 else
   gem "test-unit"