Avoid more models in old migrations

Although these migrations run fine today, they could break in the future
if changes are made to the current model code.

diff --git a/db/migrate/005_tile_tracepoints.rb b/db/migrate/005_tile_tracepoints.rb
index a6e5c9017e01237a0a236006c034500dc73c76db..7c3bb8d1cbb1e0ef4c362f9b0fbec52b53b268a8 100644 (file)
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -1,6 +1,10 @@
 require "migrate"
 
 class TileTracepoints < ActiveRecord::Migration[4.2]
 require "migrate"
 
 class TileTracepoints < ActiveRecord::Migration[4.2]

+  class Tracepoint < ActiveRecord::Base
+    self.table_name = "gps_points"
+  end
+

   def self.up
     add_column "gps_points", "tile", :bigint
     add_index "gps_points", ["tile"], :name => "points_tile_idx"
   def self.up
     add_column "gps_points", "tile", :bigint
     add_index "gps_points", ["tile"], :name => "points_tile_idx"

diff --git a/db/migrate/006_tile_nodes.rb b/db/migrate/006_tile_nodes.rb
index 70a31fde1a289198573e848fc1f007ea7d9dc695..848dc972418c5c762c6e97707abed2bcba4b44b4 100644 (file)
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -1,6 +1,14 @@
 require "migrate"
 
 class TileNodes < ActiveRecord::Migration[4.2]
 require "migrate"
 
 class TileNodes < ActiveRecord::Migration[4.2]

+  class Node < ActiveRecord::Base
+    self.table_name = "current_nodes"
+  end
+
+  class OldNode < ActiveRecord::Base
+    self.table_name = "nodes"
+  end
+

   def self.upgrade_table(from_table, to_table, model)
     if ENV["USE_DB_FUNCTIONS"]
       execute <<-SQL
   def self.upgrade_table(from_table, to_table, model)
     if ENV["USE_DB_FUNCTIONS"]
       execute <<-SQL

diff --git a/db/migrate/013_add_email_valid.rb b/db/migrate/013_add_email_valid.rb
index a45e5928a2086385cf125489e23a02eaa48f9743..b6899f3300451de83e084101f0e349b4ab221d22 100644 (file)
--- a/db/migrate/013_add_email_valid.rb
+++ b/db/migrate/013_add_email_valid.rb
@@ -1,4 +1,7 @@
 class AddEmailValid < ActiveRecord::Migration[4.2]
 class AddEmailValid < ActiveRecord::Migration[4.2]

+  class User < ActiveRecord::Base
+  end
+

   def self.up
     add_column "users", "email_valid", :boolean, :default => false, :null => false
     User.update_all("email_valid = (active != 0)") # email_valid is :boolean, but active is :integer. "email_valid = active" (see r11802 or earlier) will fail for stricter dbs than mysql
   def self.up
     add_column "users", "email_valid", :boolean, :default => false, :null => false
     User.update_all("email_valid = (active != 0)") # email_valid is :boolean, but active is :integer. "email_valid = active" (see r11802 or earlier) will fail for stricter dbs than mysql

diff --git a/db/migrate/039_add_more_controls_to_gpx_files.rb b/db/migrate/039_add_more_controls_to_gpx_files.rb
index 8cc08cda6d57b9b05760ec829fa23c9efbb099db..6ce26588ea818337aa2fef5d9faa8d5a86102c84 100644 (file)
--- a/db/migrate/039_add_more_controls_to_gpx_files.rb
+++ b/db/migrate/039_add_more_controls_to_gpx_files.rb
@@ -1,6 +1,10 @@
 require "migrate"
 
 class AddMoreControlsToGpxFiles < ActiveRecord::Migration[4.2]
 require "migrate"
 
 class AddMoreControlsToGpxFiles < ActiveRecord::Migration[4.2]

+  class Trace < ActiveRecord::Base
+    self.table_name = "gpx_files"
+  end
+

   def self.up
     create_enumeration :gpx_visibility_enum, %w[private public trackable identifiable]
     add_column :gpx_files, :visibility, :gpx_visibility_enum, :default => "public", :null => false
   def self.up
     create_enumeration :gpx_visibility_enum, %w[private public trackable identifiable]
     add_column :gpx_files, :visibility, :gpx_visibility_enum, :default => "public", :null => false

diff --git a/db/migrate/046_alter_user_roles_and_blocks.rb b/db/migrate/046_alter_user_roles_and_blocks.rb
index a61c3634419c340c9e3c9d389ae3519453549175..cbd95018d97765100d758697d6023552fc024ce5 100644 (file)
--- a/db/migrate/046_alter_user_roles_and_blocks.rb
+++ b/db/migrate/046_alter_user_roles_and_blocks.rb
@@ -1,6 +1,9 @@
 require "migrate"
 
 class AlterUserRolesAndBlocks < ActiveRecord::Migration[4.2]
 require "migrate"
 
 class AlterUserRolesAndBlocks < ActiveRecord::Migration[4.2]

+  class UserRole < ActiveRecord::Base
+  end
+

   def self.up
     # the initial granter IDs can be "self" - there are none of these
     # in the current live DB, but there may be some in people's own local
   def self.up
     # the initial granter IDs can be "self" - there are none of these
     # in the current live DB, but there may be some in people's own local

diff --git a/db/migrate/051_add_status_to_user.rb b/db/migrate/051_add_status_to_user.rb
index a58f8f8c9e829f54069b85db71a42e80fe3d6d55..5cf8a920f50e0f2e0d290bc32e91e85de4f1f1da 100644 (file)
--- a/db/migrate/051_add_status_to_user.rb
+++ b/db/migrate/051_add_status_to_user.rb
@@ -1,6 +1,9 @@
 require "migrate"
 
 class AddStatusToUser < ActiveRecord::Migration[4.2]
 require "migrate"
 
 class AddStatusToUser < ActiveRecord::Migration[4.2]

+  class User < ActiveRecord::Base
+  end
+

   def self.up
     create_enumeration :user_status_enum, %w[pending active confirmed suspended deleted]
 
   def self.up
     create_enumeration :user_status_enum, %w[pending active confirmed suspended deleted]
 

diff --git a/db/migrate/20110322001319_add_terms_seen_to_user.rb b/db/migrate/20110322001319_add_terms_seen_to_user.rb
index 729048bb29e964725473339f9cb749d8dc793777..f41782d37041e7ba562edd5f7c60ed97b457d09d 100644 (file)
--- a/db/migrate/20110322001319_add_terms_seen_to_user.rb
+++ b/db/migrate/20110322001319_add_terms_seen_to_user.rb
@@ -1,4 +1,7 @@
 class AddTermsSeenToUser < ActiveRecord::Migration[4.2]
 class AddTermsSeenToUser < ActiveRecord::Migration[4.2]

+  class User < ActiveRecord::Base
+  end
+

   def self.up
     add_column :users, :terms_seen, :boolean, :null => false, :default => false
 
   def self.up
     add_column :users, :terms_seen, :boolean, :null => false, :default => false
 

diff --git a/db/migrate/20120208122334_merge_acl_address_and_mask.rb b/db/migrate/20120208122334_merge_acl_address_and_mask.rb
index 48cdbbc2a986695851931a94ce1adc32a9967bde..f05cb4f21416216a1d9f2af7a617dd323d3d43b7 100644 (file)
--- a/db/migrate/20120208122334_merge_acl_address_and_mask.rb
+++ b/db/migrate/20120208122334_merge_acl_address_and_mask.rb
@@ -11,6 +11,9 @@ class IPAddr
 end
 
 class MergeAclAddressAndMask < ActiveRecord::Migration[4.2]
 end
 
 class MergeAclAddressAndMask < ActiveRecord::Migration[4.2]

+  class Acl < ActiveRecord::Base
+  end
+

   def up
     Acl.find_each do |acl|
       address = IPAddr.new(acl.address)
   def up
     Acl.find_each do |acl|
       address = IPAddr.new(acl.address)

diff --git a/db/migrate/20120808231205_add_counter_caches.rb b/db/migrate/20120808231205_add_counter_caches.rb
index 45cee533155aef2d680bafce1836ac5412500c61..330e2cea379586d93ea44ec26de1103058d90ea7 100644 (file)
--- a/db/migrate/20120808231205_add_counter_caches.rb
+++ b/db/migrate/20120808231205_add_counter_caches.rb
@@ -1,4 +1,11 @@
 class AddCounterCaches < ActiveRecord::Migration[4.2]
 class AddCounterCaches < ActiveRecord::Migration[4.2]

+  class Changeset < ActiveRecord::Base
+  end
+
+  class Trace < ActiveRecord::Base
+    self.table_name = "gpx_files"
+  end
+

   def self.up
     add_column :users, :changesets_count, :integer, :null => false, :default => 0
     add_column :users, :traces_count, :integer, :null => false, :default => 0
   def self.up
     add_column :users, :changesets_count, :integer, :null => false, :default => 0
     add_column :users, :traces_count, :integer, :null => false, :default => 0

diff --git a/db/migrate/20121005195010_add_diary_entry_counter_caches.rb b/db/migrate/20121005195010_add_diary_entry_counter_caches.rb
index d145c6bd53de5d03c5b6e8a42252c6c486e6d07a..b5e445400dc6a8b02d4b259fbb1d2d070dc0ccda 100644 (file)
--- a/db/migrate/20121005195010_add_diary_entry_counter_caches.rb
+++ b/db/migrate/20121005195010_add_diary_entry_counter_caches.rb
@@ -1,4 +1,10 @@
 class AddDiaryEntryCounterCaches < ActiveRecord::Migration[4.2]
 class AddDiaryEntryCounterCaches < ActiveRecord::Migration[4.2]

+  class DiaryEntry < ActiveRecord::Base
+  end
+
+  class User < ActiveRecord::Base
+  end
+

   def self.up
     add_column :users, :diary_entries_count, :integer, :null => false, :default => 0
 
   def self.up
     add_column :users, :diary_entries_count, :integer, :null => false, :default => 0
 

diff --git a/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb b/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb
index 6099f554692c219abd0f19377e3d2d3c663912e0..9e9151a849a8430ca518122dc62a867c1fbbbea2 100644 (file)
--- a/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb
+++ b/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb
@@ -1,4 +1,7 @@
 class AddImageUseGravatarToUsers < ActiveRecord::Migration[4.2]
 class AddImageUseGravatarToUsers < ActiveRecord::Migration[4.2]

+  class User < ActiveRecord::Base
+  end
+

   def self.up
     add_column :users, :image_use_gravatar, :boolean, :null => false, :default => false
 
   def self.up
     add_column :users, :image_use_gravatar, :boolean, :null => false, :default => false
 

diff --git a/db/migrate/20150111192335_subscribe_old_changesets.rb b/db/migrate/20150111192335_subscribe_old_changesets.rb
index ad23026d012449609b2e2bbd09b67151a2a3ad0c..94b3bb565f3663d4186a7929ed71f86a919672fb 100644 (file)
--- a/db/migrate/20150111192335_subscribe_old_changesets.rb
+++ b/db/migrate/20150111192335_subscribe_old_changesets.rb
@@ -1,4 +1,7 @@
 class SubscribeOldChangesets < ActiveRecord::Migration[4.2]
 class SubscribeOldChangesets < ActiveRecord::Migration[4.2]

+  class Changeset < ActiveRecord::Base
+  end
+

   def up
     Changeset.find_each do |changeset|
       changeset.subscribers << changeset.user unless changeset.subscribers.exists?(changeset.user.id)
   def up
     Changeset.find_each do |changeset|
       changeset.subscribers << changeset.user unless changeset.subscribers.exists?(changeset.user.id)

diff --git a/db/migrate/20150222101847_rename_openid_url.rb b/db/migrate/20150222101847_rename_openid_url.rb
index 3b9a8effd59df52017792bd1e7957440758c576b..a12303812f65b8d5b1ad6de711d2afed3f00b658 100644 (file)
--- a/db/migrate/20150222101847_rename_openid_url.rb
+++ b/db/migrate/20150222101847_rename_openid_url.rb
@@ -1,4 +1,7 @@
 class RenameOpenidUrl < ActiveRecord::Migration[4.2]
 class RenameOpenidUrl < ActiveRecord::Migration[4.2]

+  class User < ActiveRecord::Base
+  end
+

   def change
     rename_column :users, :openid_url, :auth_uid
     add_column :users, :auth_provider, :string
   def change
     rename_column :users, :openid_url, :auth_uid
     add_column :users, :auth_provider, :string

diff --git a/db/migrate/20161011010929_subscribe_authors_to_diary_entries.rb b/db/migrate/20161011010929_subscribe_authors_to_diary_entries.rb
index a02f52fe88d10b428ddd3db8f7258665283c9f65..76fa1fabfef5d4b1678760270a51386194214c79 100644 (file)
--- a/db/migrate/20161011010929_subscribe_authors_to_diary_entries.rb
+++ b/db/migrate/20161011010929_subscribe_authors_to_diary_entries.rb
@@ -1,4 +1,7 @@
 class SubscribeAuthorsToDiaryEntries < ActiveRecord::Migration[4.2]
 class SubscribeAuthorsToDiaryEntries < ActiveRecord::Migration[4.2]

+  class DiaryEntry < ActiveRecord::Base
+  end
+

   def up
     DiaryEntry.find_each do |diary_entry|
       diary_entry.subscriptions.create(:user => diary_entry.user) unless diary_entry.subscribers.exists?(diary_entry.user.id)
   def up
     DiaryEntry.find_each do |diary_entry|
       diary_entry.subscriptions.create(:user => diary_entry.user) unless diary_entry.subscribers.exists?(diary_entry.user.id)