mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #29850 from yahonda/test_with_mariadb_102_on_trusty
CI with the latest stable(GA) version of MariaDB 10.2
This commit is contained in:
commit
806f96ceae
2 changed files with 5 additions and 1 deletions
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue