diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2012-06-03 14:20:49 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2012-06-03 14:20:49 +0900 |
| commit | 566c8d5443a7f1077b33a1a3fc9234f4ecf7bdf3 (patch) | |
| tree | b0561d732420923ea74d3eb0329e958336e691f5 | |
| parent | 806d023b4563f907f1b93278f19fe00e77c434c6 (diff) | |
| download | rails-566c8d5443a7f1077b33a1a3fc9234f4ecf7bdf3.tar.gz rails-566c8d5443a7f1077b33a1a3fc9234f4ecf7bdf3.tar.bz2 rails-566c8d5443a7f1077b33a1a3fc9234f4ecf7bdf3.zip | |
AR::Relation#model would be a better API than AR::Relation#klass
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/relation_test.rb | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 05ced3299b..eea164e38d 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -20,6 +20,7 @@ module ActiveRecord attr_reader :table, :klass, :loaded attr_accessor :default_scoped + alias :model :klass alias :loaded? :loaded alias :default_scoped? :default_scoped diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb index 89f818a689..b7486196c5 100644 --- a/activerecord/test/cases/relation_test.rb +++ b/activerecord/test/cases/relation_test.rb @@ -19,6 +19,11 @@ module ActiveRecord assert !relation.loaded, 'relation is not loaded' end + def test_responds_to_model_and_returns_klass + relation = Relation.new :a, :b + assert_equal :a, relation.model + end + def test_initialize_single_values relation = Relation.new :a, :b (Relation::SINGLE_VALUE_METHODS - [:create_with]).each do |method| |