aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/schema
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-04-03 17:13:24 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-04-03 17:13:24 -0300
commitae110ce5d4de8cb3a22f826b0e824f333d2b2742 (patch)
tree41065be39c3ba3df5d7a02740f105911978f24db /activerecord/test/schema
parent6da3e9ad5bf38ea54135424f360df49495c07afe (diff)
parentdb5d26c9d70fb72b8aa3ea98709224dd13800024 (diff)
downloadrails-ae110ce5d4de8cb3a22f826b0e824f333d2b2742.tar.gz
rails-ae110ce5d4de8cb3a22f826b0e824f333d2b2742.tar.bz2
rails-ae110ce5d4de8cb3a22f826b0e824f333d2b2742.zip
Merge pull request #14572 from laurocaetano/with_options_and_scope
Fix error when using `with_options` with lambda. Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/schema')
-rw-r--r--activerecord/test/schema/schema.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index b44e72a67c..a9c4980283 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -638,6 +638,8 @@ ActiveRecord::Schema.define do
create_table :students, force: true do |t|
t.string :name
+ t.boolean :active
+ t.integer :college_id
end
create_table :subscribers, force: true, id: false do |t|