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

[rails.git] / db / migrate / 040_create_oauth_tables.rb

diff --git a/db/migrate/040_create_oauth_tables.rb b/db/migrate/040_create_oauth_tables.rb
index 4b372536535efef4cc7a2af39b712783d65b0327..5306b173e2f8b4983e712f9bfcff00b70470d785 100644 (file)
--- a/db/migrate/040_create_oauth_tables.rb
+++ b/db/migrate/040_create_oauth_tables.rb
@@ -1,4 +1,4 @@
-class CreateOauthTables < ActiveRecord::Migration
+class CreateOauthTables < ActiveRecord::Migration[4.2]

   def self.up
     create_table :client_applications do |t|
       t.string :name
   def self.up
     create_table :client_applications do |t|
       t.string :name


@@ -9,7 +9,7 @@ class CreateOauthTables < ActiveRecord::Migration
       t.string :secret, :limit => 50
       t.integer :user_id
 
       t.string :secret, :limit => 50
       t.integer :user_id
 

-      t.timestamps
+      t.timestamps :null => true

     end
     add_index :client_applications, :key, :unique => true
 
     end
     add_index :client_applications, :key, :unique => true
 


@@ -20,7 +20,7 @@ class CreateOauthTables < ActiveRecord::Migration
       t.string :token, :limit => 50
       t.string :secret, :limit => 50
       t.timestamp :authorized_at, :invalidated_at
       t.string :token, :limit => 50
       t.string :secret, :limit => 50
       t.timestamp :authorized_at, :invalidated_at

-      t.timestamps
+      t.timestamps :null => true

     end
 
     add_index :oauth_tokens, :token, :unique => true
     end
 
     add_index :oauth_tokens, :token, :unique => true


@@ -29,7 +29,7 @@ class CreateOauthTables < ActiveRecord::Migration
       t.string :nonce
       t.integer :timestamp
 
       t.string :nonce
       t.integer :timestamp
 

-      t.timestamps
+      t.timestamps :null => true

     end
     add_index :oauth_nonces, [:nonce, :timestamp], :unique => true
   end
     end
     add_index :oauth_nonces, [:nonce, :timestamp], :unique => true
   end