diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-04-25 10:39:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 10:39:46 -0500 |
| commit | f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76 (patch) | |
| tree | 4afabfef205d5fbd546946a16bc6cf5eb36279e9 /activerecord/test/schema/postgresql_specific_schema.rb | |
| parent | 8648f289f01656b2258687126108c389127108e0 (diff) | |
| parent | b32d64df5e5160e25804c7019e2da76bd115f3a6 (diff) | |
| download | rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.tar.gz rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.tar.bz2 rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'activerecord/test/schema/postgresql_specific_schema.rb')
| -rw-r--r-- | activerecord/test/schema/postgresql_specific_schema.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/activerecord/test/schema/postgresql_specific_schema.rb b/activerecord/test/schema/postgresql_specific_schema.rb index 860c63b27c..e56e8fa36a 100644 --- a/activerecord/test/schema/postgresql_specific_schema.rb +++ b/activerecord/test/schema/postgresql_specific_schema.rb @@ -3,11 +3,13 @@ ActiveRecord::Schema.define do enable_extension!("uuid-ossp", ActiveRecord::Base.connection) enable_extension!("pgcrypto", ActiveRecord::Base.connection) if ActiveRecord::Base.connection.supports_pgcrypto_uuid? - create_table :uuid_parents, id: :uuid, force: true do |t| + uuid_default = connection.supports_pgcrypto_uuid? ? {} : { default: "uuid_generate_v4()" } + + create_table :uuid_parents, id: :uuid, force: true, **uuid_default do |t| t.string :name end - create_table :uuid_children, id: :uuid, force: true do |t| + create_table :uuid_children, id: :uuid, force: true, **uuid_default do |t| t.string :name t.uuid :uuid_parent_id end @@ -102,7 +104,7 @@ _SQL end create_table :uuid_items, force: true, id: false do |t| - t.uuid :uuid, primary_key: true + t.uuid :uuid, primary_key: true, **uuid_default t.string :title end end |