Merge remote-tracking branch 'upstream/pull/4717'

[rails.git] / db / migrate / 018_create_acls.rb

diff --git a/db/migrate/018_create_acls.rb b/db/migrate/018_create_acls.rb
index 3606bd6704e5b51e7ae3c00d704f8259882905ff..ce5b6d4cab35f002c0322391055478ac32ddf984 100644 (file)
--- a/db/migrate/018_create_acls.rb
+++ b/db/migrate/018_create_acls.rb
@@ -1,19 +1,14 @@
-class CreateAcls < ActiveRecord::Migration
+class CreateAcls < ActiveRecord::Migration[4.2]

   def self.up
   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
+    create_table "acls", :id => false do |t|
+      t.column "id",      :primary_key, :null => false
+      t.column "address", :inet, :null => false
+      t.column "netmask", :inet, :null => false
+      t.column "k",       :string, :null => false

       t.column "v",       :string
     end
 
       t.column "v",       :string
     end
 

-    add_primary_key "acls", ["id"]

     add_index "acls", ["k"], :name => "acls_k_idx"
     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
 
   def self.down
   end
 
   def self.down