Require the migration helper code in some more migrations.

diff --git a/db/migrate/003_sql_session_store_setup.rb b/db/migrate/003_sql_session_store_setup.rb
index 4de0dd4b19120e6613528918ea7d96c248e57751..daef768b7cb7d875375aef3d449b143e0494bf7c 100644 (file)
--- a/db/migrate/003_sql_session_store_setup.rb
+++ b/db/migrate/003_sql_session_store_setup.rb
@@ -1,3 +1,5 @@
+require 'lib/migrate'
+

 class SqlSessionStoreSetup < ActiveRecord::Migration
   def self.up
     create_table "sessions", :options => innodb_option do |t|
 class SqlSessionStoreSetup < ActiveRecord::Migration
   def self.up
     create_table "sessions", :options => innodb_option do |t|

diff --git a/db/migrate/004_user_enhancements.rb b/db/migrate/004_user_enhancements.rb
index a6e81d222fcd190cef0aa969352ae923a4354b5e..1c3bb50073d48f81d85e7afac745cb1bb3c46c77 100644 (file)
--- a/db/migrate/004_user_enhancements.rb
+++ b/db/migrate/004_user_enhancements.rb
@@ -1,3 +1,5 @@
+require 'lib/migrate'
+

 class UserEnhancements < ActiveRecord::Migration
   def self.up
     add_column "diary_entries", "latitude", :double
 class UserEnhancements < ActiveRecord::Migration
   def self.up
     add_column "diary_entries", "latitude", :double

diff --git a/db/migrate/007_add_relations.rb b/db/migrate/007_add_relations.rb
index c265fc3adef1507c8d4e672acf8fcb98a2fc0520..37fbd63d2b6ac15cf942b41cff86b75886a5b4bd 100644 (file)
--- a/db/migrate/007_add_relations.rb
+++ b/db/migrate/007_add_relations.rb
@@ -1,3 +1,5 @@
+require 'lib/migrate'
+

 class AddRelations < ActiveRecord::Migration
   def self.up
     # a relation can have members much like a way can have nodes.
 class AddRelations < ActiveRecord::Migration
   def self.up
     # a relation can have members much like a way can have nodes.

diff --git a/db/migrate/010_diary_comments.rb b/db/migrate/010_diary_comments.rb
index 43019a938ff96738d322d39361e6677632871528..bf73199121bf01416a89f968948a91883e039e8f 100644 (file)
--- a/db/migrate/010_diary_comments.rb
+++ b/db/migrate/010_diary_comments.rb
@@ -1,3 +1,5 @@
+require 'lib/migrate'
+

 class DiaryComments < ActiveRecord::Migration
   def self.up
     create_table "diary_comments", myisam_table do |t|
 class DiaryComments < ActiveRecord::Migration
   def self.up
     create_table "diary_comments", myisam_table do |t|

diff --git a/db/migrate/018_create_acls.rb b/db/migrate/018_create_acls.rb
index 5205b99b0403feaab7c65ba199637b253014004b..d82020892eca9863391da5da324768220f926712 100644 (file)
--- a/db/migrate/018_create_acls.rb
+++ b/db/migrate/018_create_acls.rb
@@ -1,3 +1,5 @@
+require 'lib/migrate'
+

 class CreateAcls < ActiveRecord::Migration
   def self.up
     create_table "acls", myisam_table do |t|
 class CreateAcls < ActiveRecord::Migration
   def self.up
     create_table "acls", myisam_table do |t|

diff --git a/db/migrate/020_populate_node_tags_and_remove.rb b/db/migrate/020_populate_node_tags_and_remove.rb
index dc048f1906134eab74d7f3b7bf35c09d3bfb3e77..7d07911890257dd4ea7b4b43a4f9467a780b2587 100644 (file)
--- a/db/migrate/020_populate_node_tags_and_remove.rb
+++ b/db/migrate/020_populate_node_tags_and_remove.rb
@@ -1,3 +1,5 @@
+require 'lib/migrate'
+

 class PopulateNodeTagsAndRemove < ActiveRecord::Migration
   def self.up
     have_nodes = select_value("SELECT count(*) FROM current_nodes").to_i != 0
 class PopulateNodeTagsAndRemove < ActiveRecord::Migration
   def self.up
     have_nodes = select_value("SELECT count(*) FROM current_nodes").to_i != 0

diff --git a/db/migrate/021_move_to_innodb.rb b/db/migrate/021_move_to_innodb.rb
index da0488ca5f7a3d6bb40f6ccc7717ceb34487096e..8312dec2c92213b63cff6ea00161ea19b813a6ba 100644 (file)
--- a/db/migrate/021_move_to_innodb.rb
+++ b/db/migrate/021_move_to_innodb.rb
@@ -1,3 +1,5 @@
+require 'lib/migrate'
+

 class MoveToInnodb < ActiveRecord::Migration
   @@conv_tables = ['nodes', 'ways', 'way_tags', 'way_nodes',
     'current_way_tags', 'relation_members',
 class MoveToInnodb < ActiveRecord::Migration
   @@conv_tables = ['nodes', 'ways', 'way_tags', 'way_nodes',
     'current_way_tags', 'relation_members',

diff --git a/db/migrate/024_order_relation_members.rb b/db/migrate/024_order_relation_members.rb
index 5500edfcfbf4ac42e9a35e9d754dfdc049a96a47..76ec32222237ef32649849426140aa9b9cd0022e 100644 (file)
--- a/db/migrate/024_order_relation_members.rb
+++ b/db/migrate/024_order_relation_members.rb
@@ -1,3 +1,5 @@
+require 'lib/migrate'
+

 class OrderRelationMembers < ActiveRecord::Migration
   def self.up
     # add sequence column. rails won't let us define an ordering here,
 class OrderRelationMembers < ActiveRecord::Migration
   def self.up
     # add sequence column. rails won't let us define an ordering here,

diff --git a/db/migrate/025_add_end_time_to_changesets.rb b/db/migrate/025_add_end_time_to_changesets.rb
index 4941b72b92fb4b5264bfe42d84b2189394608e14..20d66719df800384a2a708a83cdda4b0fcb172ee 100644 (file)
--- a/db/migrate/025_add_end_time_to_changesets.rb
+++ b/db/migrate/025_add_end_time_to_changesets.rb
@@ -1,3 +1,5 @@
+require 'lib/migrate'
+

 class AddEndTimeToChangesets < ActiveRecord::Migration
   def self.up
     # swap the boolean closed-or-not for a time when the changeset will
 class AddEndTimeToChangesets < ActiveRecord::Migration
   def self.up
     # swap the boolean closed-or-not for a time when the changeset will