diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-25 04:44:26 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-25 04:44:26 -0700 |
| commit | 0b06e901c80ba02c1856bb78fcdb7097e983d704 (patch) | |
| tree | 4822c1a9b80ee67e5ffe0b1b194180e4106983e8 /activerecord/test/models | |
| parent | 4dd47fb9d5885b345dedfd00d55ad0425ab46904 (diff) | |
| parent | 5a2a703fe81e015288243b8e9c53dac6557c04fd (diff) | |
| download | rails-0b06e901c80ba02c1856bb78fcdb7097e983d704.tar.gz rails-0b06e901c80ba02c1856bb78fcdb7097e983d704.tar.bz2 rails-0b06e901c80ba02c1856bb78fcdb7097e983d704.zip | |
Merge pull request #11593 from rajcybage/fix_test_models
change function def self.table_name to self.table_name
Diffstat (limited to 'activerecord/test/models')
| -rw-r--r-- | activerecord/test/models/auto_id.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/models/movie.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/test/models/auto_id.rb b/activerecord/test/models/auto_id.rb index d720e2be5e..b92619f2de 100644 --- a/activerecord/test/models/auto_id.rb +++ b/activerecord/test/models/auto_id.rb @@ -1,4 +1,4 @@ class AutoId < ActiveRecord::Base - def self.table_name () "auto_id_tests" end - def self.primary_key () "auto_id" end + self.table_name = "auto_id_tests" + self.primary_key = "auto_id" end diff --git a/activerecord/test/models/movie.rb b/activerecord/test/models/movie.rb index 6384b4c801..c441be2bef 100644 --- a/activerecord/test/models/movie.rb +++ b/activerecord/test/models/movie.rb @@ -1,5 +1,3 @@ class Movie < ActiveRecord::Base - def self.primary_key - "movieid" - end + self.primary_key = "movieid" end |