move bigint_pk id column into table def, no need to be an add_column

diff --git a/db/migrate/010_diary_comments.rb b/db/migrate/010_diary_comments.rb
index be07d851ae96cfd4918b5ebb4d2c3d2130384ff8..43019a938ff96738d322d39361e6677632871528 100644 (file)
--- a/db/migrate/010_diary_comments.rb
+++ b/db/migrate/010_diary_comments.rb
@@ -1,7 +1,7 @@
 class DiaryComments < ActiveRecord::Migration
   def self.up
     create_table "diary_comments", myisam_table do |t|
-      t.column "id",             :bigint,   :limit => 20, :null => false
+      t.column "id",             :bigint_pk,              :null => false
       t.column "diary_entry_id", :bigint,   :limit => 20, :null => false
       t.column "user_id",        :bigint,   :limit => 20, :null => false
       t.column "body",           :text,                   :null => false
@@ -9,10 +9,8 @@ class DiaryComments < ActiveRecord::Migration
       t.column "updated_at",     :datetime,               :null => false
     end
 
-    add_primary_key "diary_comments", ["id"]
     add_index "diary_comments", ["diary_entry_id", "id"], :name => "diary_comments_entry_id_idx", :unique => true
 
-    change_column "diary_comments", "id", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"
   end
 
   def self.down

diff --git a/db/migrate/021_add_changesets.rb b/db/migrate/021_add_changesets.rb
index 772a5f20daf051aee38f3cb6e3a3c69ca96846ba..9b769c772a0ce2790e25f774ec8ca3c6b6400f54 100644 (file)
--- a/db/migrate/021_add_changesets.rb
+++ b/db/migrate/021_add_changesets.rb
@@ -4,6 +4,7 @@ class AddChangesets < ActiveRecord::Migration
   
   def self.up
     create_table "changesets", innodb_table do |t|
+      t.column "id",             :bigint_pk,              :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
@@ -12,7 +13,6 @@ class AddChangesets < ActiveRecord::Migration
       t.column "min_lon",        :integer,                :null => true
       t.column "max_lon",        :integer,                :null => true
     end
-    add_column :changesets, :id, :bigint_pk
 
     create_table "changeset_tags", innodb_table do |t|
       t.column "id", :bigint, :limit => 64, :null => false