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

[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 08ed4f7316b8b9fad91873b7d0c067c91e0d5373..ce5b6d4cab35f002c0322391055478ac32ddf984 100644 (file)
--- a/db/migrate/018_create_acls.rb
+++ b/db/migrate/018_create_acls.rb
@@ -1,12 +1,10 @@
-require 'migrate'
-
-class CreateAcls < ActiveRecord::Migration
+class CreateAcls < ActiveRecord::Migration[4.2]
   def self.up
-    create_table "acls", myisam_table do |t|
-      t.column "id",      :integer_pk, :null => false
-      t.column "address", :inet,       :null => false
-      t.column "netmask", :inet,       :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