From: Andy Allan <gravitystorm@gmail.com>
Date: Sat, 8 Nov 2008 12:30:42 +0000 (+0000)
Subject: move bigint_pk id column into table def, no need to be an add_column
X-Git-Tag: live~7604^2~203
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/204fa8706495a4f78612d0e2a21f10b94649cc86?hp=fb627873c2b9df6dc740ad3c4ce1b8ff6c5ecdab

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 be07d851a..43019a938 100644
--- 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 772a5f20d..9b769c772 100644
--- 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