Fixup the base migration so that it creates a database which matches the

one on the live server.

diff --git a/db/migrate/001_create_osm_db.rb b/db/migrate/001_create_osm_db.rb
index e62f7de78eea7475579cb2a875037613d028d58c..a9eeec814821abd09db2c90e05ff06b92793e2e3 100644 (file)
--- a/db/migrate/001_create_osm_db.rb
+++ b/db/migrate/001_create_osm_db.rb
@@ -1,226 +1,291 @@
-class CreateOsmDb < ActiveRecord::Migration
-  def self.up
+module ActiveRecord
+  module ConnectionAdapters
+    module SchemaStatements
+      def add_primary_key(table_name, column_name, options = {})
+        index_name = options[:name]
+        column_names = Array(column_name)
+        quoted_column_names = column_names.map { |e| quote_column_name(e) }.join(", ")
+        execute "ALTER TABLE #{table_name} ADD PRIMARY KEY #{quote_column_name(index_name)} (#{quoted_column_names})"
+      end

 
 

-    ActiveRecord::Schema.define(:version => 0) do
+      alias_method :old_add_column_options!, :add_column_options!

 
 

-      create_table "area_segments", :force => true do |t|
-        t.column "segment_id",  :integer
-        t.column "version",     :integer, :limit => 20, :default => 0, :null => false
-        t.column "sequence_id", :integer,                              :null => false
+      def add_column_options!(sql, options)
+        old_add_column_options!(sql, options)
+        sql << " #{options[:options]}"

       end
 
       end
 

-      add_index "area_segments", ["id"], :name => "area_segments_id_idx"
-      add_index "area_segments", ["segment_id"], :name => "area_segments_segment_id_idx"
-      add_index "area_segments", ["id", "version"], :name => "area_segments_id_version_idx"
+      alias_method :old_options_include_default?, :options_include_default?

 
 

-      create_table "area_tags", :force => true do |t|
-        t.column "k",           :string
-        t.column "v",           :string
-        t.column "version",     :integer, :limit => 20, :default => 0, :null => false
-        t.column "sequence_id", :integer,                              :null => false
+      def options_include_default?(options)
+        old_options_include_default?(options) && !(options[:options] =~ /AUTO_INCREMENT/i)

       end
       end

+    end

 
 

-      create_table "areas", :force => true do |t|
-        t.column "user_id",   :integer,  :limit => 20
-        t.column "timestamp", :datetime
-        t.column "version",   :integer,  :limit => 20,                   :null => false
-        t.column "visible",   :boolean,                :default => true
-      end
+    class MysqlAdapter
+      alias_method :old_native_database_types, :native_database_types

 
 

-      create_table "current_nodes", :force => true do |t|
-        t.column "latitude",  :float
-        t.column "longitude", :float
-        t.column "user_id",   :integer,  :limit => 20
-        t.column "visible",   :boolean
-        t.column "tags",      :text,                   :default => "", :null => false
-        t.column "timestamp", :datetime
+      def native_database_types
+        types = old_native_database_types
+        types[:bigint] = { :name => "bigint", :limit => 20 }
+        types

       end
       end

+    end
+  end
+end

 
 

-      add_index "current_nodes", ["id"], :name => "current_nodes_id_idx"
-      add_index "current_nodes", ["latitude", "longitude"], :name => "current_nodes_lat_lon_idx"
+class CreateOsmDb < ActiveRecord::Migration
+  def self.up
+    myisam_table = { :id => false, :force => true, :options => "ENGINE=MyIsam DEFAULT CHARSET=utf8" }
+    innodb_table = { :id => false, :force => true, :options => "ENGINE=InnoDB DEFAULT CHARSET=utf8" }
+
+    create_table "current_nodes", innodb_table do |t|
+      t.column "id",        :bigint,   :limit => 64,                 :null => false
+      t.column "latitude",  :double
+      t.column "longitude", :double
+      t.column "user_id",   :bigint,   :limit => 20
+      t.column "visible",   :boolean
+      t.column "tags",      :text,                   :default => "", :null => false
+      t.column "timestamp", :datetime
+    end

 
 

-      create_table "current_segments", :force => true do |t|
-        t.column "node_a",    :integer,  :limit => 64
-        t.column "node_b",    :integer,  :limit => 64
-        t.column "user_id",   :integer,  :limit => 20
-        t.column "visible",   :boolean
-        t.column "tags",      :text,                   :default => "", :null => false
-        t.column "timestamp", :datetime
-      end
+    add_index "current_nodes", ["id"], :name => "current_nodes_id_idx"
+    add_index "current_nodes", ["latitude", "longitude"], :name => "current_nodes_lat_lon_idx"
+    add_index "current_nodes", ["timestamp"], :name => "current_nodes_timestamp_idx"

 
 

-      add_index "current_segments", ["id", "visible"], :name => "current_segments_id_visible_idx"
-      add_index "current_segments", ["node_a"], :name => "current_segments_a_idx"
-      add_index "current_segments", ["node_b"], :name => "current_segments_b_idx"
+    change_column "current_nodes", "id", :bigint, :limit => 64, :null => false, :options => "AUTO_INCREMENT"

 
 

-      create_table "current_way_segments", :force => true do |t|
-        t.column "segment_id",  :integer
-        t.column "sequence_id", :integer
-      end
+    create_table "current_segments", innodb_table do |t|
+      t.column "id",        :bigint,   :limit => 64,                 :null => false
+      t.column "node_a",    :bigint,   :limit => 64
+      t.column "node_b",    :bigint,   :limit => 64
+      t.column "user_id",   :bigint,   :limit => 20
+      t.column "visible",   :boolean
+      t.column "tags",      :text,                   :default => "", :null => false
+      t.column "timestamp", :datetime
+    end

 
 

-      add_index "current_way_segments", ["segment_id"], :name => "current_way_segments_seg_idx"
-      add_index "current_way_segments", ["id"], :name => "current_way_segments_id_idx"
+    add_index "current_segments", ["id", "visible"], :name => "current_segments_id_visible_idx"
+    add_index "current_segments", ["node_a"], :name => "current_segments_a_idx"
+    add_index "current_segments", ["node_b"], :name => "current_segments_b_idx"

 
 

-      create_table "current_way_tags", :force => true do |t|
-        t.column "k", :string, :default => "", :null => false
-        t.column "v", :string, :default => "", :null => false
-      end
+    change_column "current_segments", "id", :bigint, :limit => 64, :null => false, :options => "AUTO_INCREMENT"

 
 

-      add_index "current_way_tags", ["id"], :name => "current_way_tags_id_idx"
-      add_index "current_way_tags", ["v"], :name => "current_way_tags_v_idx"
+    create_table "current_way_segments", innodb_table do |t|
+      t.column "id",          :bigint, :limit => 64
+      t.column "segment_id",  :bigint, :limit => 11
+      t.column "sequence_id", :bigint, :limit => 11
+    end

 
 

-      create_table "current_ways", :force => true do |t|
-        t.column "user_id",   :integer,  :limit => 20
-        t.column "timestamp", :datetime
-        t.column "visible",   :boolean
-      end
+    add_index "current_way_segments", ["segment_id"], :name => "current_way_segments_seg_idx"
+    add_index "current_way_segments", ["id"], :name => "current_way_segments_id_idx"

 
 

-      add_index "current_ways", ["id", "visible"], :name => "current_ways_id_visible_idx"
+    create_table "current_way_tags", myisam_table do |t|
+      t.column "id", :bigint, :limit => 64
+      t.column "k",  :string,                :default => "", :null => false
+      t.column "v",  :string,                :default => "", :null => false
+    end

 
 

-      create_table "diary_entries", :force => true do |t|
-        t.column "user_id",    :integer,  :limit => 20, :null => false
-        t.column "title",      :string
-        t.column "body",       :text
-        t.column "created_at", :datetime
-        t.column "updated_at", :datetime
-      end
+    add_index "current_way_tags", ["id"], :name => "current_way_tags_id_idx"
+    execute "CREATE FULLTEXT INDEX `current_way_tags_v_idx` ON `current_way_tags` (`v`)"

 
 

-      create_table "friends", :force => true do |t|
-        t.column "user_id",        :integer, :limit => 20, :null => false
-        t.column "friend_user_id", :integer, :limit => 20, :null => false
-      end
+    create_table "current_ways", myisam_table do |t|
+      t.column "id",        :bigint,   :limit => 64, :null => false
+      t.column "user_id",   :bigint,   :limit => 20
+      t.column "timestamp", :datetime
+      t.column "visible",   :boolean
+    end

 
 

-      add_index "friends", ["friend_user_id"], :name => "user_id_idx"
+    add_primary_key "current_ways", ["id"], :name => "current_ways_id_idx", :unique => true

 
 

-      create_table "gps_points", :id => false, :force => true do |t|
-        t.column "altitude",  :float
-        t.column "user_id",   :integer,  :limit => 20
-        t.column "trackid",   :integer
-        t.column "latitude",  :integer
-        t.column "longitude", :integer
-        t.column "gpx_id",    :integer,  :limit => 20
-        t.column "timestamp", :datetime
-      end
+    change_column "current_ways", "id", :bigint, :limit => 64, :null => false, :options => "AUTO_INCREMENT"

 
 

-      add_index "gps_points", ["latitude", "longitude", "user_id"], :name => "points_idx"
-      add_index "gps_points", ["user_id"], :name => "points_uid_idx"
-      add_index "gps_points", ["gpx_id"], :name => "points_gpxid_idx"
+    create_table "diary_entries", myisam_table do |t|
+      t.column "id",         :bigint,   :limit => 20, :null => false
+      t.column "user_id",    :bigint,   :limit => 20, :null => false
+      t.column "title",      :string
+      t.column "body",       :text
+      t.column "created_at", :datetime
+      t.column "updated_at", :datetime
+    end

 
 

-      create_table "gpx_file_tags", :force => true do |t|
-        t.column "gpx_id", :integer, :limit => 64, :default => 0, :null => false
-        t.column "tag",    :string
-      end
+    add_primary_key "diary_entries", ["id"], :name => "diary_entries_id_idx", :unique => true

 
 

-      add_index "gpx_file_tags", ["gpx_id"], :name => "gpx_file_tags_gpxid_idx"
-
-      create_table "gpx_files", :force => true do |t|
-        t.column "user_id",     :integer,  :limit => 20
-        t.column "visible",     :boolean,                :default => true, :null => false
-        t.column "name",        :string,                 :default => "",   :null => false
-        t.column "size",        :integer,  :limit => 20
-        t.column "latitude",    :float
-        t.column "longitude",   :float
-        t.column "timestamp",   :datetime
-        t.column "public",      :boolean,                :default => true, :null => false
-        t.column "description", :string,                 :default => ""
-        t.column "inserted",    :boolean
-      end
+    change_column "diary_entries", "id", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"

 
 

-      add_index "gpx_files", ["timestamp"], :name => "gpx_files_timestamp_idx"
-      add_index "gpx_files", ["visible", "public"], :name => "gpx_files_visible_public_idx"
+    create_table "friends", myisam_table do |t|
+      t.column "id",             :bigint,  :limit => 20, :null => false
+      t.column "user_id",        :bigint,  :limit => 20, :null => false
+      t.column "friend_user_id", :bigint,  :limit => 20, :null => false
+    end

 
 

-      create_table "gpx_pending_files", :id => false, :force => true do |t|
-        t.column "originalname", :string
-        t.column "tmpname",      :string
-        t.column "user_id",      :integer, :limit => 20
-      end
+    add_primary_key "friends", ["id"], :name => "friends_id_idx", :unique => true
+    add_index "friends", ["friend_user_id"], :name => "user_id_idx"

 
 

-      create_table "messages", :force => true do |t|
-        t.column "title",             :string
-        t.column "body",              :text
-        t.column "sent_on",           :datetime
-        t.column "message_read",      :boolean,                :default => false
-        t.column "from_user_id",      :integer,  :limit => 20,                    :null => false
-        t.column "to_user_id",        :integer,  :limit => 20, :default => 0,     :null => false
-        t.column "from_display_name", :string,                 :default => ""
-      end
+    change_column "friends", "id", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"

 
 

-      add_index "messages", ["from_display_name"], :name => "from_name_idx"
+    create_table "gps_points", myisam_table do |t|
+      t.column "altitude",  :float
+      t.column "user_id",   :integer,  :limit => 20
+      t.column "trackid",   :integer
+      t.column "latitude",  :integer
+      t.column "longitude", :integer
+      t.column "gpx_id",    :integer,  :limit => 20
+      t.column "timestamp", :datetime
+    end

 
 

-      create_table "meta_areas", :force => true do |t|
-        t.column "user_id",   :integer,  :limit => 20
-        t.column "timestamp", :datetime
-      end
+    add_index "gps_points", ["latitude", "longitude", "user_id"], :name => "points_idx"
+    add_index "gps_points", ["user_id"], :name => "points_uid_idx"
+    add_index "gps_points", ["gpx_id"], :name => "points_gpxid_idx"

 
 

-      create_table "nodes", :force => true do |t|
-        t.column "latitude",  :float
-        t.column "longitude", :float
-        t.column "user_id",   :integer,  :limit => 20
-        t.column "visible",   :boolean
-        t.column "tags",      :text,                   :default => "", :null => false
-        t.column "timestamp", :datetime
-      end
+    create_table "gpx_file_tags", myisam_table do |t|
+      t.column "gpx_id", :bigint,  :limit => 64, :default => 0, :null => false
+      t.column "tag",    :string
+      t.column "id",     :integer, :limit => 20, :null => false
+    end

 
 

-      add_index "nodes", ["id"], :name => "nodes_uid_idx"
-      add_index "nodes", ["latitude", "longitude"], :name => "nodes_latlon_idx"
+    add_primary_key "gpx_file_tags", ["id"], :name => "gpx_file_tags_id_idx", :unique => true
+    add_index "gpx_file_tags", ["gpx_id"], :name => "gpx_file_tags_gpxid_idx"
+
+    change_column "gpx_file_tags", "id", :integer, :limit => 20, :null => false, :options => "AUTO_INCREMENT"
+
+    create_table "gpx_files", myisam_table do |t|
+      t.column "id",          :bigint,   :limit => 64,                   :null => false
+      t.column "user_id",     :bigint,   :limit => 20
+      t.column "visible",     :boolean,                :default => true, :null => false
+      t.column "name",        :string,                 :default => "",   :null => false
+      t.column "size",        :bigint,   :limit => 20
+      t.column "latitude",    :double
+      t.column "longitude",   :double
+      t.column "timestamp",   :datetime
+      t.column "public",      :boolean,                :default => true, :null => false
+      t.column "description", :string,                 :default => ""
+      t.column "inserted",    :boolean
+    end

 
 

-      create_table "segments", :force => true do |t|
-        t.column "node_a",    :integer,  :limit => 64
-        t.column "node_b",    :integer,  :limit => 64
-        t.column "user_id",   :integer,  :limit => 20
-        t.column "visible",   :boolean
-        t.column "tags",      :text,                   :default => "", :null => false
-        t.column "timestamp", :datetime
-      end
+    add_primary_key "gpx_files", ["id"], :name => "gpx_files_id_idx", :unique => true
+    add_index "gpx_files", ["timestamp"], :name => "gpx_files_timestamp_idx"
+    add_index "gpx_files", ["visible", "public"], :name => "gpx_files_visible_public_idx"

 
 

-      add_index "segments", ["node_a"], :name => "street_segments_nodea_idx"
-      add_index "segments", ["node_b"], :name => "street_segments_nodeb_idx"
-      add_index "segments", ["id"], :name => "street_segment_uid_idx"
-
-      create_table "users", :force => true do |t|
-        t.column "email",         :string
-        t.column "token",         :string
-        t.column "active",        :integer,                :default => 0,     :null => false
-        t.column "pass_crypt",    :string
-        t.column "creation_time", :datetime
-        t.column "timeout",       :datetime
-        t.column "display_name",  :string,                 :default => ""
-        t.column "preferences",   :text
-        t.column "data_public",   :boolean,                :default => false
-        t.column "description",   :text,                   :default => "",    :null => false
-        t.column "home",          :integer,  :limit => 64
-        t.column "home_lat",      :float
-        t.column "home_lon",      :float
-        t.column "within_lat",    :float
-        t.column "within_lon",    :float
-      end
+    change_column "gpx_files", "id", :bigint, :limit => 64, :null => false, :options => "AUTO_INCREMENT"

 
 

-      add_index "users", ["email"], :name => "users_email_idx"
-      add_index "users", ["display_name"], :name => "users_display_name_idx"
+    create_table "gpx_pending_files", myisam_table do |t|
+      t.column "originalname", :string
+      t.column "tmpname",      :string
+      t.column "user_id",      :bigint,  :limit => 20
+    end

 
 

-      create_table "way_segments", :force => true do |t|
-        t.column "segment_id",  :integer
-        t.column "version",     :integer, :limit => 20, :default => 0, :null => false
-        t.column "sequence_id", :integer,                              :null => false
-      end
+    create_table "messages", myisam_table do |t|
+      t.column "id",                :bigint,   :limit => 20,                    :null => false
+      t.column "user_id",           :bigint,   :limit => 20,                    :null => false
+      t.column "from_user_id",      :bigint,   :limit => 20,                    :null => false
+      t.column "from_display_name", :string,                 :default => ""
+      t.column "title",             :string
+      t.column "body",              :text
+      t.column "sent_on",           :datetime
+      t.column "message_read",      :boolean,                :default => false
+      t.column "to_user_id",        :bigint,   :limit => 20,                    :null => false
+    end

 
 

-      create_table "way_tags", :force => true do |t|
-        t.column "k",       :string
-        t.column "v",       :string
-        t.column "version", :integer, :limit => 20
-      end
+    add_primary_key "messages", ["id"], :name => "messages_id_idx", :unique => true
+    add_index "messages", ["from_display_name"], :name => "from_name_idx"

 
 

-      add_index "way_tags", ["id", "version"], :name => "way_tags_id_version_idx"
+    change_column "messages", "id", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"

 
 

-      create_table "ways", :force => true do |t|
-        t.column "user_id",   :integer,  :limit => 20
-        t.column "timestamp", :datetime
-        t.column "version",   :integer,  :limit => 20,                   :null => false
-        t.column "visible",   :boolean,                :default => true
-      end
+    create_table "meta_areas", myisam_table do |t|
+      t.column "id",        :bigint,  :limit => 64, :null => false
+      t.column "user_id",   :bigint,  :limit => 20
+      t.column "timestamp", :datetime
+    end
+
+    add_primary_key "meta_areas", ["id"], :name => "meta_areas_id_idx", :unique => true

 
 

-      add_index "ways", ["id"], :name => "ways_id_version_idx"
+    change_column "meta_areas", "id", :bigint, :limit => 64, :null => false, :options => "AUTO_INCREMENT"

 
 

+    create_table "nodes", myisam_table do |t|
+      t.column "id",        :bigint,  :limit => 64
+      t.column "latitude",  :double
+      t.column "longitude", :double
+      t.column "user_id",   :bigint,  :limit => 20
+      t.column "visible",   :boolean
+      t.column "tags",      :text,                  :default => "", :null => false
+      t.column "timestamp", :datetime

     end
     end

+
+    add_index "nodes", ["id"], :name => "nodes_uid_idx"
+    add_index "nodes", ["latitude", "longitude"], :name => "nodes_latlon_idx"
+
+    create_table "segments", myisam_table do |t|
+      t.column "id",        :bigint,  :limit => 64
+      t.column "node_a",    :bigint,  :limit => 64
+      t.column "node_b",    :bigint,  :limit => 64
+      t.column "user_id",   :bigint,  :limit => 20
+      t.column "visible",   :boolean
+      t.column "tags",      :text,                  :default => "", :null => false
+      t.column "timestamp", :datetime
+    end
+
+    add_index "segments", ["node_a"], :name => "street_segments_nodea_idx"
+    add_index "segments", ["node_b"], :name => "street_segments_nodeb_idx"
+    add_index "segments", ["id"], :name => "street_segment_uid_idx"
+
+    create_table "users", innodb_table do |t|
+      t.column "email",         :string
+      t.column "id",            :bigint,   :limit => 20,                    :null => false
+      t.column "token",         :string
+      t.column "active",        :integer,                :default => 0,     :null => false
+      t.column "pass_crypt",    :string
+      t.column "creation_time", :datetime
+      t.column "timeout",       :datetime
+      t.column "display_name",  :string,                 :default => ""
+      t.column "preferences",   :text
+      t.column "data_public",   :boolean,                :default => false
+      t.column "description",   :text,                   :default => "",    :null => false
+      t.column "home_lat",      :double,                 :default => 1
+      t.column "home_lon",      :double,                 :default => 1
+      t.column "within_lon",    :double
+      t.column "within_lat",    :double
+      t.column "home_zoom",     :integer,  :limit => 2,  :default => 3
+    end
+
+    add_primary_key "users", ["id"], :name => "users_id_idx", :unique => true
+    add_index "users", ["email"], :name => "users_email_idx"
+    add_index "users", ["display_name"], :name => "users_display_name_idx"
+
+    change_column "users", "id", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"
+
+    create_table "way_segments", myisam_table do |t|
+      t.column "id",          :bigint,  :limit => 64, :default => 0, :null => false
+      t.column "segment_id",  :integer
+      t.column "version",     :bigint,  :limit => 20, :default => 0, :null => false
+      t.column "sequence_id", :bigint,  :limit => 11,                :null => false
+    end
+
+    add_primary_key "way_segments", ["id", "version", "sequence_id"], :name => "way_segments_id_version_sequence_idx", :unique => true
+
+    change_column "way_segments", "sequence_id", :bigint, :limit => 11, :null => false, :options => "AUTO_INCREMENT"
+
+    create_table "way_tags", myisam_table do |t|
+      t.column "id",      :bigint,  :limit => 64, :default => 0, :null => false
+      t.column "k",       :string
+      t.column "v",       :string
+      t.column "version", :bigint,  :limit => 20
+    end
+
+    add_index "way_tags", ["id", "version"], :name => "way_tags_id_version_idx"
+
+    create_table "ways", myisam_table do |t|
+      t.column "id",        :bigint,   :limit => 64, :default => 0, :null => false
+      t.column "user_id",   :bigint,   :limit => 20
+      t.column "timestamp", :datetime
+      t.column "version",   :bigint,   :limit => 20,                   :null => false
+      t.column "visible",   :boolean,                :default => true
+    end
+
+    add_primary_key "ways", ["id", "version"], :name => "ways_primary_idx", :unique => true
+    add_index "ways", ["id"], :name => "ways_id_version_idx"
+
+    change_column "ways", "version", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"

   end
 
   def self.down
   end
 
   def self.down