Merge pull request #166 from ninech/bugfix-audit-log

fixed migration mess
rbCAS · May 25, 2016 · aab47a5 · aab47a5
2 parents 5ca4e49 + 83f1f7c
commit aab47a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/app/models/casino/login_attempt.rb b/app/models/casino/login_attempt.rb
@@ -2,10 +2,4 @@ class CASino::LoginAttempt < ActiveRecord::Base
   include CASino::ModelConcern::BrowserInfo
 
   belongs_to :user
-
-  def username=(username)
-    super
-
-    self.user = CASino::User.find_by_username(username)
-  end
 end
diff --git a/db/migrate/20160524121117_remove_username_from_login_attempts.rb b/db/migrate/20160524121117_remove_username_from_login_attempts.rb
@@ -0,0 +1,11 @@
+class RemoveUsernameFromLoginAttempts < ActiveRecord::Migration
+  def up
+    remove_column :casino_login_attempts, :username
+    change_column_null :casino_login_attempts, :user_id, false
+  end
+
+  def down
+    add_column :casino_login_attempts, :username, :string
+    change_column_null :casino_login_attempts, :user_id, true
+  end
+end