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

[Abhijith PA]

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

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

commit d9bffb68db1ed4f87198f87664ace2961810847c
Merge: b881364 add85de
Author: Abhijith PA <abhijith at openmailbox.org>
Date:   Mon Mar 7 13:58:46 2016 +0530

    Merge tag 'upstream/0.12.0'
    
    Upstream version 0.12.0

 .travis.yml                                        |   2 +-
 CHANGELOG.md                                       |  24 +++
 Gemfile                                            |  11 +-
 README.markdown                                    |  21 +--
 Rakefile                                           |   2 +-
 benchmarks/benchmark.rb                            |  48 +++---
 benchmarks/boot.rb                                 |  18 --
 benchmarks/lib/cli_parser.rb                       |  40 +++--
 .../{mysql_benchmark.rb => mysql2_benchmark.rb}    |  13 +-
 benchmarks/lib/output_to_csv.rb                    |   6 +-
 benchmarks/models/test_innodb.rb                   |   2 +-
 benchmarks/models/test_memory.rb                   |   2 +-
 benchmarks/models/test_myisam.rb                   |   2 +-
 gemfiles/3.1.gemfile                               |   1 -
 gemfiles/3.2.gemfile                               |   1 -
 gemfiles/4.0.gemfile                               |   3 +-
 gemfiles/4.1.gemfile                               |   1 -
 gemfiles/4.2.gemfile                               |   1 -
 gemfiles/5.0.gemfile                               |   3 +
 lib/activerecord-import.rb                         |  27 ++-
 .../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                 | 108 +++++++++++-
 lib/activerecord-import/base.rb                    |   1 -
 lib/activerecord-import/em_mysql2.rb               |   7 -
 lib/activerecord-import/import.rb                  | 147 +++++++++++++----
 lib/activerecord-import/mysql.rb                   |   7 -
 lib/activerecord-import/synchronize.rb             |   4 +-
 lib/activerecord-import/version.rb                 |   2 +-
 metadata.yml                                       |  40 ++---
 test/adapters/em_mysql2.rb                         |   1 -
 test/adapters/mysql.rb                             |   1 -
 test/adapters/mysqlspatial.rb                      |   1 -
 test/database.yml.sample                           |  12 --
 test/em_mysql2/import_test.rb                      |   6 -
 test/import_test.rb                                |  53 +++++-
 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/models/widget.rb                              |   3 +-
 test/mysql/import_test.rb                          |   6 -
 test/mysql2/import_test.rb                         |   5 +-
 test/mysqlspatial/import_test.rb                   |   6 -
 test/mysqlspatial2/import_test.rb                  |   4 +-
 test/postgresql/import_test.rb                     |   4 +
 test/schema/generic_schema.rb                      |  22 ++-
 .../support/active_support/test_case_extensions.rb |   6 +
 test/support/{mysql => }/assertions.rb             |  20 ++-
 test/support/factories.rb                          |  14 ++
 test/support/mysql/import_examples.rb              | 122 ++++----------
 test/support/postgresql/import_examples.rb         | 181 ++++++++++++++++++++-
 .../shared_examples/on_duplicate_key_update.rb     |  92 +++++++++++
 test/test_helper.rb                                |   8 +-
 test/travis/build.sh                               |  22 ++-
 test/travis/database.yml                           |  12 --
 61 files changed, 846 insertions(+), 366 deletions(-)

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