From: Andy Allan <gravitystorm@gmail.com>
Date: Sat, 8 Nov 2008 11:01:39 +0000 (+0000)
Subject: Change bigint id column to monkeypatching-friendly syntax
X-Git-Tag: live~7573^2~207
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e598ee220f30bbe4b6033d087e25a8fee0bcebe2?hp=67a50e848c8d9998a88d153429ae9d1ae25d3baf

Change bigint id column to monkeypatching-friendly syntax
---

diff --git a/db/migrate/020_add_changesets.rb b/db/migrate/020_add_changesets.rb
index 75a909e80..772a5f20d 100644
--- a/db/migrate/020_add_changesets.rb
+++ b/db/migrate/020_add_changesets.rb
@@ -4,7 +4,6 @@ class AddChangesets < ActiveRecord::Migration
   
   def self.up
     create_table "changesets", innodb_table do |t|
-      t.column "id",             :bigint,   :limit => 20, :null => false
       t.column "user_id",        :bigint,   :limit => 20, :null => false
       t.column "created_at",     :datetime,               :null => false
       t.column "open",           :boolean,                :null => false, :default => true
@@ -13,11 +12,7 @@ class AddChangesets < ActiveRecord::Migration
       t.column "min_lon",        :integer,                :null => true
       t.column "max_lon",        :integer,                :null => true
     end
-
-    add_primary_key "changesets", ["id"]
-    # FIXME add indexes?
-
-    change_column "changesets", "id", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"
+    add_column :changesets, :id, :bigint_pk
 
     create_table "changeset_tags", innodb_table do |t|
       t.column "id", :bigint, :limit => 64, :null => false
diff --git a/lib/migrate.rb b/lib/migrate.rb
index 26e95a496..68ff04615 100644
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -44,6 +44,7 @@ module ActiveRecord
         types = old_native_database_types
         types[:bigint] = { :name => "bigint", :limit => 20 }
         types[:double] = { :name => "double" }
+        types[:bigint_pk] = { :name => "bigint(20) DEFAULT NULL auto_increment PRIMARY KEY" }
         types
       end