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

[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 5205b99b0403feaab7c65ba199637b253014004b..c5c7c7444d776c1afe40c10ff151770de12b1817 100644 (file)
--- a/db/migrate/018_create_acls.rb
+++ b/db/migrate/018_create_acls.rb
@@ -1,10 +1,12 @@
-class CreateAcls < ActiveRecord::Migration
+require "migrate"
+
+class CreateAcls < ActiveRecord::Migration[4.2]

   def self.up
   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
 
       t.column "v",       :string
     end