aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2006-12-29 17:24:35 +0000
committerJamis Buck <jamis@37signals.com>2006-12-29 17:24:35 +0000
commit0bfabaa048bdc70eae0cce399809ebd2bb129ffe (patch)
tree9539b590fa514ac3be68a1426112b84ab65cdf28 /activerecord/lib/active_record/base.rb
parenta8d7215060568c4ad36efd3faa64f861e05b4873 (diff)
downloadrails-0bfabaa048bdc70eae0cce399809ebd2bb129ffe.tar.gz
rails-0bfabaa048bdc70eae0cce399809ebd2bb129ffe.tar.bz2
rails-0bfabaa048bdc70eae0cce399809ebd2bb129ffe.zip
make sure query attributes on custom fields works as it used to
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5807 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-xactiverecord/lib/active_record/base.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index f5e6fb57e3..26010d8643 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1978,7 +1978,13 @@ module ActiveRecord #:nodoc:
false
else
column = self.class.columns_hash[attr_name]
- if column.number?
+ if column.nil?
+ if value !~ /[^0-9]/
+ !value.to_i.zero?
+ else
+ !value.blank?
+ end
+ elsif column.number?
!value.zero?
else
!value.blank?