Fix primary key creation for ACL table.

diff --git a/db/migrate/018_create_acls.rb b/db/migrate/018_create_acls.rb
index 3606bd6704e5b51e7ae3c00d704f8259882905ff..c9fd1f3e7f957d709762f98632ba6c00a2275a78 100644 (file)
--- a/db/migrate/018_create_acls.rb
+++ b/db/migrate/018_create_acls.rb
@@ -1,17 +1,15 @@
 class CreateAcls < ActiveRecord::Migration
   def self.up
     create_table "acls", myisam_table do |t|
-      t.column "id",      :integer, :null => false
-      t.column "address", :integer, :null => false
-      t.column "netmask", :integer, :null => false
-      t.column "k",       :string,  :null => false
+      t.column "id",      :integer_pk, :null => false
+      t.column "address", :integer,    :null => false
+      t.column "netmask", :integer,    :null => false
+      t.column "k",       :string,     :null => false
       t.column "v",       :string
     end
 
-    add_primary_key "acls", ["id"]
     add_index "acls", ["k"], :name => "acls_k_idx"
 
-    change_column "acls", "id", :integer, :null => false, :options => "AUTO_INCREMENT"
     change_column "acls", "address", :integer, :null => false, :unsigned => true
     change_column "acls", "netmask", :integer, :null => false, :unsigned => true
   end

diff --git a/lib/migrate.rb b/lib/migrate.rb
index 3b1e46fb8fb608f48b0be269a0533f0cc597122b..bb8ffa6e8f4a4d1507d1f2625fa9b51985d0b49f 100644 (file)
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -46,6 +46,7 @@ module ActiveRecord
         types = old_native_database_types
         types[:bigint] = { :name => "bigint", :limit => 20 }
         types[:double] = { :name => "double" }
+        types[:integer_pk] = { :name => "integer DEFAULT NULL auto_increment PRIMARY KEY" }
         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" }
@@ -106,6 +107,7 @@ module ActiveRecord
       def native_database_types
         types = old_native_database_types
         types[:double] = { :name => "double precision" }
+        types[:integer_pk] = { :name => "serial PRIMARY KEY" }
         types[:bigint_pk] = { :name => "bigserial PRIMARY KEY" }
         types[:bigint_pk_64] = { :name => "bigserial PRIMARY KEY" }
         types[:bigint_auto_64] = { :name => "bigint" } #fixme: need autoincrement?