aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-06-25 21:55:38 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-06-25 21:55:38 +0900
commit135437cbb660ec0db5dc2cca1c78c6ad985ec807 (patch)
treeb1009cc0df5dc37393b9c8d1c0fb9a5383f43fe9
parent3d9e8d7c110f7053d73f61f2297bd46722294121 (diff)
downloadrails-135437cbb660ec0db5dc2cca1c78c6ad985ec807.tar.gz
rails-135437cbb660ec0db5dc2cca1c78c6ad985ec807.tar.bz2
rails-135437cbb660ec0db5dc2cca1c78c6ad985ec807.zip
Ensure that using correct alias tracker
Covering #27994 in tests. Closes #27994.
-rw-r--r--activerecord/test/models/membership.rb1
-rw-r--r--activerecord/test/schema/schema.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/models/membership.rb b/activerecord/test/models/membership.rb
index 2c3ad230a7..0f8be0ad85 100644
--- a/activerecord/test/models/membership.rb
+++ b/activerecord/test/models/membership.rb
@@ -1,4 +1,5 @@
class Membership < ActiveRecord::Base
+ enum type: %i(Membership CurrentMembership SuperMembership SelectedMembership TenantMembership)
belongs_to :member
belongs_to :club
end
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 6da0ef26f6..d7ceb6d4ef 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -491,7 +491,7 @@ ActiveRecord::Schema.define do
t.datetime :joined_on
t.integer :club_id, :member_id
t.boolean :favourite, default: false
- t.string :type
+ t.integer :type
end
create_table :member_types, force: true do |t|