diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-09-01 22:18:47 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 22:18:47 +0900 |
| commit | 806f96ceaecbf9cf8d2fdbbdaf1fb2a499769cbf (patch) | |
| tree | cb7d5798f5fd2b8fc0fda1a278e626483a12cbc6 | |
| parent | 17faed96b48d6c6b0bd3e8f5c5b0117537fefa11 (diff) | |
| parent | acaff3b3bfe4918e00920fb14c9f4240d00dcb21 (diff) | |
| download | rails-806f96ceaecbf9cf8d2fdbbdaf1fb2a499769cbf.tar.gz rails-806f96ceaecbf9cf8d2fdbbdaf1fb2a499769cbf.tar.bz2 rails-806f96ceaecbf9cf8d2fdbbdaf1fb2a499769cbf.zip | |
Merge pull request #29850 from yahonda/test_with_mariadb_102_on_trusty
CI with the latest stable(GA) version of MariaDB 10.2
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/migration/columns_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 6c7380f050..723c999fd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,7 @@ matrix: env: - "GEM=ar:mysql2 MYSQL=mariadb" addons: - mariadb: 10.0 + mariadb: 10.2 - rvm: 2.3.4 env: - "GEM=ar:sqlite3_mem" diff --git a/activerecord/test/cases/migration/columns_test.rb b/activerecord/test/cases/migration/columns_test.rb index 1b1d0af132..8ca20b6172 100644 --- a/activerecord/test/cases/migration/columns_test.rb +++ b/activerecord/test/cases/migration/columns_test.rb @@ -142,6 +142,10 @@ module ActiveRecord end def test_remove_column_with_multi_column_index + # MariaDB starting with 10.2.8 + # Dropping a column that is part of a multi-column UNIQUE constraint is not permitted. + skip if current_adapter?(:Mysql2Adapter) && connection.mariadb? && connection.version >= "10.2.8" + add_column "test_models", :hat_size, :integer add_column "test_models", :hat_style, :string, limit: 100 add_index "test_models", ["hat_style", "hat_size"], unique: true |