From 5a2a703fe81e015288243b8e9c53dac6557c04fd Mon Sep 17 00:00:00 2001 From: Rajarshi Das Date: Thu, 25 Jul 2013 16:24:12 +0530 Subject: change function def self.table_name to self.table_name change def self.primary_key to self.primary_key change def self.primary_key to self.primary_key --- activerecord/test/models/movie.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'activerecord/test/models/movie.rb') 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 -- cgit v1.2.3 From ec8ef1e1055c4e1598da13f49d30261f07f4a9b4 Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Sat, 17 Aug 2013 21:38:53 +0530 Subject: Revert "Merge branch 'master' of github.com:rails/docrails" This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake. --- activerecord/test/models/movie.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'activerecord/test/models/movie.rb') diff --git a/activerecord/test/models/movie.rb b/activerecord/test/models/movie.rb index c441be2bef..6384b4c801 100644 --- a/activerecord/test/models/movie.rb +++ b/activerecord/test/models/movie.rb @@ -1,3 +1,5 @@ class Movie < ActiveRecord::Base - self.primary_key = "movieid" + def self.primary_key + "movieid" + end end -- cgit v1.2.3 From 48ee1e793eba9bdded2869471b50f18f8cd65f2f Mon Sep 17 00:00:00 2001 From: Rajarshi Das Date: Thu, 25 Jul 2013 16:24:12 +0530 Subject: change function def self.table_name to self.table_name change def self.primary_key to self.primary_key change def self.primary_key to self.primary_key --- activerecord/test/models/movie.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'activerecord/test/models/movie.rb') 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 -- cgit v1.2.3