diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2019-07-08 10:20:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-08 10:20:45 -0500 |
| commit | c00cd7b446aaeb8e2486142938238b26c48ed711 (patch) | |
| tree | d33b5cb6ab8bf61f4f04ac5731c54a2336661461 /activerecord/test/schema | |
| parent | fe30211574648fa21bff958a3cf952fd0c20c3b1 (diff) | |
| parent | 84ff4f6ea2a118b47160e3fe7ed29bff52c2a7a2 (diff) | |
| download | rails-c00cd7b446aaeb8e2486142938238b26c48ed711.tar.gz rails-c00cd7b446aaeb8e2486142938238b26c48ed711.tar.bz2 rails-c00cd7b446aaeb8e2486142938238b26c48ed711.zip | |
Merge branch 'master' into add_database_exist_method
Diffstat (limited to 'activerecord/test/schema')
| -rw-r--r-- | activerecord/test/schema/mysql2_specific_schema.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/schema/schema.rb | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/test/schema/mysql2_specific_schema.rb b/activerecord/test/schema/mysql2_specific_schema.rb index b143035213..911ac808c6 100644 --- a/activerecord/test/schema/mysql2_specific_schema.rb +++ b/activerecord/test/schema/mysql2_specific_schema.rb @@ -62,10 +62,6 @@ ActiveRecord::Schema.define do t.binary :binary_column, limit: 1 end - create_table :enum_tests, id: false, force: true do |t| - t.column :enum_column, "ENUM('text','blob','tiny','medium','long','unsigned','bigint')" - end - execute "DROP PROCEDURE IF EXISTS ten" execute <<~SQL diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index eed18a7b89..b6c0ae0de2 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -115,7 +115,7 @@ ActiveRecord::Schema.define do t.column :font_size, :integer, **default_zero t.column :difficulty, :integer, **default_zero t.column :cover, :string, default: "hard" - t.string :isbn + t.string :isbn, **case_sensitive_options t.datetime :published_on t.index [:author_id, :name], unique: true t.index :isbn, where: "published_on IS NOT NULL", unique: true |