Merge remote-tracking branch 'upstream/pull/4789'

[rails.git] / app / models / user_preference.rb

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index d5cad3978c81f087cacee2b13f3e152aa87df506..35412c9e783afb83cc8e6da0b8dc8243610a4ae9 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -2,7 +2,7 @@
 #
 # Table name: user_preferences
 #
 #
 # Table name: user_preferences
 #

-#  user_id :bigint(8)        not null, primary key
+#  user_id :bigint           not null, primary key

 #  k       :string           not null, primary key
 #  v       :string           not null
 #
 #  k       :string           not null, primary key
 #  v       :string           not null
 #


@@ -12,10 +12,8 @@
 #
 
 class UserPreference < ApplicationRecord
 #
 
 class UserPreference < ApplicationRecord

-  self.primary_keys = "user_id", "k"
-

   belongs_to :user
 
   belongs_to :user
 

-  validates :user, :presence => true, :associated => true
+  validates :user, :associated => true

   validates :k, :v, :length => 1..255, :characters => true
 end
   validates :k, :v, :length => 1..255, :characters => true
 end