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 75a909e8038606532b76d987480f36d0891b9f0d..772a5f20daf051aee38f3cb6e3a3c69ca96846ba 100644 (file)
--- 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|
   
   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
       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
       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
 
     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 26e95a496264142d2414e63a199c300942142154..68ff04615b48b4a3eee3cd90aaa3fd39c1da8d34 100644 (file)
--- 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 = 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
 
         types
       end