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

[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 95d690512300fbcbeaaf9c86509ff74d258cfd8b..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,10 +9,10 @@ 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

-    
+

     create_table :oauth_tokens do |t|
       t.integer :user_id
       t.string :type, :limit => 20
     create_table :oauth_tokens do |t|
       t.integer :user_id
       t.string :type, :limit => 20


@@ -20,19 +20,18 @@ 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
     end

-    
+

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

-    
+

     create_table :oauth_nonces do |t|
       t.string :nonce
       t.integer :timestamp
 
     create_table :oauth_nonces do |t|
       t.string :nonce
       t.integer :timestamp
 

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

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

-    

   end
 
   def self.down
   end
 
   def self.down


@@ -40,5 +39,4 @@ class CreateOauthTables < ActiveRecord::Migration
     drop_table :oauth_tokens
     drop_table :oauth_nonces
   end
     drop_table :oauth_tokens
     drop_table :oauth_nonces
   end

-

 end
 end