[DRE-commits] [ruby-activerecord-import] 01/04: Merge tag 'upstream/0.11.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 1dac71bd1dd9f376ac7c0dd50c4eb340ee322973
Merge: 74f5d17 00bc758
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Apr 10 15:23:42 2016 +0530

    Merge tag 'upstream/0.11.0'
    
    Upstream version 0.11.0
    
    # gpg: Signature made Sunday 10 April 2016 03:23:39 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 CHANGELOG.md                                       |  24 ----
 Gemfile                                            |   6 +-
 README.markdown                                    |  15 +-
 Rakefile                                           |   2 +-
 benchmarks/benchmark.rb                            |   3 +-
 benchmarks/lib/cli_parser.rb                       |   2 +-
 .../{mysql2_benchmark.rb => mysql_benchmark.rb}    |  13 +-
 gemfiles/3.1.gemfile                               |   2 +
 gemfiles/3.2.gemfile                               |   2 +
 gemfiles/4.0.gemfile                               |   2 +
 gemfiles/4.1.gemfile                               |   2 +
 gemfiles/4.2.gemfile                               |   2 +
 gemfiles/5.0.gemfile                               |   2 +
 .../active_record/adapters/em_mysql2_adapter.rb    |   8 ++
 .../active_record/adapters/mysql_adapter.rb        |   6 +
 .../adapters/abstract_adapter.rb                   |  13 +-
 lib/activerecord-import/adapters/mysql_adapter.rb  |  16 +--
 .../adapters/postgresql_adapter.rb                 | 106 +-------------
 lib/activerecord-import/base.rb                    |   1 +
 lib/activerecord-import/em_mysql2.rb               |   7 +
 lib/activerecord-import/import.rb                  | 113 +++------------
 lib/activerecord-import/mysql.rb                   |   7 +
 lib/activerecord-import/version.rb                 |   2 +-
 metadata.yml                                       |  37 +++--
 test/adapters/em_mysql2.rb                         |   1 +
 test/adapters/mysql.rb                             |   1 +
 test/adapters/mysqlspatial.rb                      |   1 +
 test/database.yml.sample                           |  12 ++
 test/{jdbcmysql => em_mysql2}/import_test.rb       |   2 +-
 test/import_test.rb                                |   2 +-
 test/jdbcmysql/import_test.rb                      |   4 +-
 test/jdbcpostgresql/import_test.rb                 |   1 +
 test/models/book.rb                                |   8 +-
 test/models/promotion.rb                           |   3 -
 test/models/question.rb                            |   3 -
 test/models/rule.rb                                |   3 -
 test/models/topic.rb                               |   2 +-
 test/{jdbcmysql => mysql}/import_test.rb           |   4 +-
 test/mysql2/import_test.rb                         |   5 +-
 test/{jdbcmysql => mysqlspatial}/import_test.rb    |   4 +-
 test/mysqlspatial2/import_test.rb                  |   4 +-
 test/postgresql/import_test.rb                     |   4 -
 test/schema/generic_schema.rb                      |  21 +--
 test/support/em-synchrony_extensions.rb            |  13 ++
 test/support/factories.rb                          |  14 --
 test/support/{ => mysql}/assertions.rb             |  15 +-
 test/support/mysql/import_examples.rb              | 147 +++++++++++++++----
 test/support/postgresql/import_examples.rb         | 157 +--------------------
 .../shared_examples/on_duplicate_key_update.rb     |  92 ------------
 test/test_helper.rb                                |   6 +-
 test/travis/build.sh                               |  20 ++-
 test/travis/database.yml                           |  12 ++
 52 files changed, 303 insertions(+), 651 deletions(-)

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