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

[Sruthi Chandran]

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

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

commit e86149ee5e3d049d2dcc877f5cb639b52ae68f18
Merge: 223b0ed 7b2c1b4
Author: Sruthi Chandran <srud at disroot.org>
Date:   Fri Aug 26 20:42:23 2016 +0530

    Merge tag 'upstream/0.13.0'
    
    Upstream version 0.13.0

 .rubocop.yml                                       |  49 +++
 .rubocop_todo.yml                                  |  36 ++
 .travis.yml                                        |  38 ++-
 CHANGELOG.md                                       |  43 +++
 Gemfile                                            |  11 +-
 README.markdown                                    |  20 +-
 Rakefile                                           |   7 +-
 activerecord-import.gemspec                        |   2 +-
 benchmarks/benchmark.rb                            | 134 ++++----
 benchmarks/lib/base.rb                             | 273 ++++++++--------
 benchmarks/lib/cli_parser.rb                       | 213 ++++++------
 .../{mysql_benchmark.rb => mysql2_benchmark.rb}    |  41 ++-
 benchmarks/lib/output_to_csv.rb                    |   3 +-
 benchmarks/lib/output_to_html.rb                   |  21 +-
 benchmarks/schema/mysql_schema.rb                  |  16 +-
 gemfiles/3.1.gemfile                               |   2 -
 gemfiles/3.2.gemfile                               |   2 -
 gemfiles/4.0.gemfile                               |   4 +-
 gemfiles/4.1.gemfile                               |   4 +-
 gemfiles/4.2.gemfile                               |   4 +-
 gemfiles/5.0.gemfile                               |   4 +-
 lib/activerecord-import.rb                         |   2 +
 .../active_record/adapters/em_mysql2_adapter.rb    |   8 -
 .../active_record/adapters/mysql_adapter.rb        |   6 -
 .../active_record/adapters/sqlite3_adapter.rb      |   1 -
 .../adapters/abstract_adapter.rb                   |  31 +-
 lib/activerecord-import/adapters/mysql_adapter.rb  |  46 ++-
 .../adapters/postgresql_adapter.rb                 | 116 ++++++-
 .../adapters/sqlite3_adapter.rb                    |  18 +-
 lib/activerecord-import/base.rb                    |   7 +-
 lib/activerecord-import/em_mysql2.rb               |   7 -
 lib/activerecord-import/import.rb                  | 364 +++++++++++++--------
 lib/activerecord-import/mysql.rb                   |   7 -
 lib/activerecord-import/synchronize.rb             |  40 +--
 lib/activerecord-import/value_sets_parser.rb       |  13 +-
 lib/activerecord-import/version.rb                 |   2 +-
 metadata.yml                                       | 217 ------------
 test/adapters/em_mysql2.rb                         |   1 -
 test/adapters/mysql.rb                             |   1 -
 test/adapters/mysql2spatial.rb                     |   2 +-
 test/adapters/mysqlspatial.rb                      |   1 -
 test/adapters/postgis.rb                           |   2 +-
 test/adapters/postgresql.rb                        |   2 +-
 test/adapters/spatialite.rb                        |   2 +-
 test/adapters/sqlite3.rb                           |   2 +-
 test/database.yml.sample                           |  12 -
 test/em_mysql2/import_test.rb                      |   6 -
 test/import_test.rb                                | 193 +++++++----
 test/jdbcmysql/import_test.rb                      |   4 +-
 test/jdbcpostgresql/import_test.rb                 |   1 -
 test/models/book.rb                                |  11 +-
 test/models/chapter.rb                             |   4 +-
 test/models/discount.rb                            |   3 +
 test/models/end_note.rb                            |   4 +-
 test/models/promotion.rb                           |   3 +
 test/models/question.rb                            |   3 +
 test/models/rule.rb                                |   3 +
 test/models/topic.rb                               |   6 +-
 test/models/widget.rb                              |   2 +-
 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/postgis/import_test.rb                        |   2 +-
 test/postgresql/import_test.rb                     |   4 +
 test/schema/generic_schema.rb                      | 193 ++++++-----
 test/schema/mysql_schema.rb                        |  12 +-
 test/sqlite3/import_test.rb                        |   2 -
 .../support/active_support/test_case_extensions.rb |  27 +-
 test/support/{mysql => }/assertions.rb             |  17 +-
 test/support/em-synchrony_extensions.rb            |  13 -
 test/support/factories.rb                          |  39 ++-
 test/support/generate.rb                           |   8 +-
 test/support/mysql/import_examples.rb              | 165 +++-------
 test/support/postgresql/import_examples.rb         | 223 +++++++++++--
 .../shared_examples/on_duplicate_key_update.rb     |  92 ++++++
 test/synchronize_test.rb                           |   4 +-
 test/test_helper.rb                                |  14 +-
 test/travis/build.sh                               |  30 --
 test/travis/database.yml                           |  12 -
 test/value_sets_bytes_parser_test.rb               |  31 +-
 test/value_sets_records_parser_test.rb             |  12 +-
 82 files changed, 1656 insertions(+), 1345 deletions(-)

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