[DRE-commits] [ruby-activerecord-import] 01/05: Merge tag 'upstream/0.15.0'

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-activerecord-import.

commit 1221284952e87d05b64699a5a3da3979ccb26847
Merge: 10e4713 7069f71
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Sep 18 11:04:23 2016 +0530

    Merge tag 'upstream/0.15.0'
    
    Upstream version 0.15.0
    
    # gpg: Signature made Sunday 18 September 2016 11:04:23 AM IST using RSA key ID CE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 .travis.yml                                        |  10 +-
 CHANGELOG.md                                       |  44 +++++
 Gemfile                                            |   2 +-
 Rakefile                                           |  14 +-
 activerecord-import.gemspec                        |   2 +-
 benchmarks/lib/base.rb                             |   4 +-
 benchmarks/lib/output_to_html.rb                   |   2 +-
 gemfiles/3.1.gemfile                               |   3 -
 gemfiles/4.2.gemfile                               |   4 +
 gemfiles/5.0.gemfile                               |   2 +-
 lib/activerecord-import.rb                         |   3 +-
 .../adapters/abstract_adapter.rb                   |   5 +-
 .../adapters/postgresql_adapter.rb                 |  18 +-
 .../adapters/sqlite3_adapter.rb                    |  12 +-
 lib/activerecord-import/base.rb                    |   2 +
 lib/activerecord-import/import.rb                  |  75 +++++---
 lib/activerecord-import/synchronize.rb             |   2 +-
 lib/activerecord-import/version.rb                 |   2 +-
 test/adapters/mysql2_makara.rb                     |   1 +
 test/adapters/postgresql_makara.rb                 |   1 +
 test/database.yml.sample                           |  19 +-
 test/import_test.rb                                |  70 ++++---
 test/mysql2_makara/import_test.rb                  |   6 +
 test/sqlite3/import_test.rb                        |   2 +
 test/support/factories.rb                          |   5 +
 test/support/postgresql/import_examples.rb         | 210 +++++++--------------
 .../shared_examples/on_duplicate_key_update.rb     | 105 ++++++-----
 test/support/shared_examples/recursive_import.rb   | 122 ++++++++++++
 test/travis/database.yml                           |  33 +++-
 29 files changed, 501 insertions(+), 279 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-activerecord-import.git