From: Tom Hughes Date: Tue, 6 Jun 2017 19:33:09 +0000 (+0100) Subject: Add explicit primary key declaration for changeset subscriptions X-Git-Tag: live~3325 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fb4ea1a02ac5dc1b0ef444e0d63fafa8f756fa8d Add explicit primary key declaration for changeset subscriptions This table has a composite primary key and although we don't really rely on that at all rails 5.0 warns about itif you don't explcitly declare it in order to trigger the CPK extension. --- diff --git a/app/models/diary_entry_subscription.rb b/app/models/diary_entry_subscription.rb index b0a563ea8..8b96f6074 100644 --- a/app/models/diary_entry_subscription.rb +++ b/app/models/diary_entry_subscription.rb @@ -1,4 +1,6 @@ class DiaryEntrySubscription < ActiveRecord::Base + self.primary_keys = "user_id", "diary_entry_id" + belongs_to :user belongs_to :diary_entry end