rails4: Remove activecord primary_key monkey patch

Braulio Bhavamitra
1 parent d4733489
Showing 1 changed file with 1 additions and 6 deletions Show diff stats
lib/noosfero/core_ext/active_record.rb
@@ -2,11 +2,6 @@ require &#39;active_record&#39;
  
 class ActiveRecord::Base
  
-  # default primary key
-  def self.primary_key
-    @primary_key = 'id' if self.column_names.include? 'id'
-  end
-
   def self.postgresql?
     ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
   end
@@ -68,7 +63,7 @@ class ActiveRecord::Base
 end
  
 ActiveRecord::Calculations.class_eval do
-  def count_with_distinct column_name=:id, options={}
+  def count_with_distinct column_name=nil, options={}
     distinct.count_without_distinct column_name, options
   end
   alias_method_chain :count, :distinct
...	...	@@ -2,11 +2,6 @@ require 'active_record'
2	2
3	3	class ActiveRecord::Base
4	4
5		- # default primary key
6		- def self.primary_key
7		- @primary_key = 'id' if self.column_names.include? 'id'
8		- end
9		-
10	5	def self.postgresql?
11	6	ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
12	7	end
...	...	@@ -68,7 +63,7 @@ class ActiveRecord::Base
68	63	end
69	64
70	65	ActiveRecord::Calculations.class_eval do
71		- def count_with_distinct column_name=:id, options={}
	66	+ def count_with_distinct column_name=nil, options={}
72	67	distinct.count_without_distinct column_name, options
73	68	end
74	69	alias_method_chain :count, :distinct
...	...