last of the auto_increments removed from the migrations

diff --git a/db/migrate/001_create_osm_db.rb b/db/migrate/001_create_osm_db.rb
index fdced3e1b6bcdad573f146f9b64f38b1993c1b86..998e12951795555880a8841579ef8fcc1b8a52a1 100644 (file)
--- a/db/migrate/001_create_osm_db.rb
+++ b/db/migrate/001_create_osm_db.rb
@@ -199,7 +199,7 @@ class CreateOsmDb < ActiveRecord::Migration
 
     add_primary_key "way_segments", ["id", "version", "sequence_id"]
 
-    change_column "way_segments", "sequence_id", :bigint, :limit => 11, :null => false, :options => "AUTO_INCREMENT"
+    change_column "way_segments", "sequence_id", :bigint_auto_11
 
     create_table "way_tags", myisam_table do |t|
       t.column "id",      :bigint,  :limit => 64, :default => 0, :null => false
@@ -221,7 +221,7 @@ class CreateOsmDb < ActiveRecord::Migration
     add_primary_key "ways", ["id", "version"]
     add_index "ways", ["id"], :name => "ways_id_version_idx"
 
-    change_column "ways", "version", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"
+    change_column "ways", "version", :bigint_auto_20
   end
 
   def self.down

diff --git a/db/migrate/007_add_relations.rb b/db/migrate/007_add_relations.rb
index 5dcdeb28d51e3e4bb631101d92cc85d620a258d2..dea777d5d24292e9acb409b2ababe4196bc9d884 100644 (file)
--- a/db/migrate/007_add_relations.rb
+++ b/db/migrate/007_add_relations.rb
@@ -65,7 +65,7 @@ class AddRelations < ActiveRecord::Migration
     add_primary_key "relations", ["id", "version"]
     add_index "relations", ["timestamp"], :name => "relations_timestamp_idx"
     
-    change_column "relations", "version", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"
+    change_column "relations", "version", :bigint_auto_20
   end
 
 

diff --git a/lib/migrate.rb b/lib/migrate.rb
index 782436af3ff4926e7c6d43e0f1ddac0affe416b2..77bc93646d0eef922d958973e4acd8481df69c79 100644 (file)
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -47,6 +47,8 @@ module ActiveRecord
         types[:bigint_pk] = { :name => "bigint(20) DEFAULT NULL auto_increment PRIMARY KEY" }
         types[:bigint_pk_64] = { :name => "bigint(64) DEFAULT NULL auto_increment PRIMARY KEY" }
         types[:bigint_auto_64] = { :name => "bigint(64) DEFAULT NULL auto_increment" }
+        types[:bigint_auto_11] = { :name => "bigint(11) DEFAULT NULL auto_increment" }
+        types[:bigint_auto_20] = { :name => "bigint(20) DEFAULT NULL auto_increment" }
         types
       end