From b0899194907789431b570a1983ff8b019ed53ba2 Mon Sep 17 00:00:00 2001 From: Dominik Sander Date: Sat, 14 Jun 2014 20:00:31 +0200 Subject: [PATCH] Skip validations in the oauth migration Also enforced the presence of needed attributes of the services table on the database level --- app/concerns/oauthable.rb | 1 - db/migrate/20140515211100_create_services.rb | 8 ++++---- ...0525150140_migrate_agents_to_service_authentication.rb | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/concerns/oauthable.rb b/app/concerns/oauthable.rb index 57f523dc..743cf53f 100644 --- a/app/concerns/oauthable.rb +++ b/app/concerns/oauthable.rb @@ -4,7 +4,6 @@ module Oauthable included do |base| attr_accessible :service_id validates_presence_of :service_id - base.extend ClassMethods self.class_variable_set(:@@valid_oauth_providers, :all) end diff --git a/db/migrate/20140515211100_create_services.rb b/db/migrate/20140515211100_create_services.rb index 5da930ee..7499bb00 100644 --- a/db/migrate/20140515211100_create_services.rb +++ b/db/migrate/20140515211100_create_services.rb @@ -1,10 +1,10 @@ class CreateServices < ActiveRecord::Migration def change create_table :services do |t| - t.integer :user_id - t.string :provider - t.string :name - t.text :token + t.integer :user_id, null: false + t.string :provider, null: false + t.string :name, null: false + t.text :token, null: false t.text :secret t.text :refresh_token t.datetime :expires_at diff --git a/db/migrate/20140525150140_migrate_agents_to_service_authentication.rb b/db/migrate/20140525150140_migrate_agents_to_service_authentication.rb index 11459fe4..cb9fc219 100644 --- a/db/migrate/20140525150140_migrate_agents_to_service_authentication.rb +++ b/db/migrate/20140525150140_migrate_agents_to_service_authentication.rb @@ -24,7 +24,7 @@ class MigrateAgentsToServiceAuthentication < ActiveRecord::Migration secret: twitter_oauth_token_secret(agent) ) agent.service_id = service.id - agent.save! + agent.save!(validate: false) end if agents.length > 0 puts <<-EOF.strip_heredoc