From 0124ae18c594fbc7c40bcf80e44a9feb0b9cf977 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 10 Dec 2013 13:20:35 +0200 Subject: [PATCH] Fix User#by_username_or_id for postgres Signed-off-by: Dmitriy Zaporozhets --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 3080851548e..f1f68d5f424 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -198,7 +198,7 @@ class User < ActiveRecord::Base end def by_username_or_id(name_or_id) - where('username = ? OR id = ?', name_or_id, name_or_id).first + where('users.username = ? OR users.id = ?', name_or_id, name_or_id.to_i).first end def build_user(attrs = {}, options= {})