diff options
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/quoting.rb | 10 | ||||
| -rwxr-xr-x | activerecord/test/base_test.rb | 7 | ||||
| -rwxr-xr-x | activerecord/test/deprecated_finder_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/finder_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/fixtures/db_definitions/sqlite.sql | 2 | ||||
| -rw-r--r-- | activerecord/test/fixtures/topics.yml | 4 |
7 files changed, 21 insertions, 12 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 0e1c28e330..1c063c003d 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1094,7 +1094,7 @@ module ActiveRecord #:nodoc: # Turns an +attribute+ that's currently true into false and vice versa. Returns self. def toggle(attribute) - self[attribute] = quote(!send("#{attribute}?", column_for_attribute(attribute))) + self[attribute] = !send("#{attribute}?") self end diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb index c8088bd978..c7e7d83ca1 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb @@ -14,11 +14,11 @@ module ActiveRecord "'#{quote_string(value)}'" # ' (for ruby-mode) end when NilClass then "NULL" - when TrueClass then (column && column.type == :boolean ? quoted_true : "1") - when FalseClass then (column && column.type == :boolean ? quoted_false : "0") + when TrueClass then (column && column.type == :integer ? '1' : quoted_true) + when FalseClass then (column && column.type == :integer ? '0' : quoted_false) when Float, Fixnum, Bignum then value.to_s when Date then "'#{value.to_s}'" - when Time, DateTime then "'#{value.strftime("%Y-%m-%d %H:%M:%S")}'" + when Time, DateTime then "'#{quoted_date(value)}'" else "'#{quote_string(value.to_yaml)}'" end end @@ -42,6 +42,10 @@ module ActiveRecord def quoted_false "'f'" end + + def quoted_date(value) + value.strftime("%Y-%m-%d %H:%M:%S") + end end end end
\ No newline at end of file diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb index 50d1673361..fd5e439ef4 100755 --- a/activerecord/test/base_test.rb +++ b/activerecord/test/base_test.rb @@ -380,7 +380,7 @@ class BasicsTest < Test::Unit::TestCase end def test_update_by_condition - Topic.update_all "content = 'bulk updated!'", "approved = 1" + Topic.update_all "content = 'bulk updated!'", ["approved = ?", true] assert_equal "Have a nice day", Topic.find(1).content assert_equal "bulk updated!", Topic.find(2).content end @@ -812,6 +812,11 @@ class BasicsTest < Test::Unit::TestCase assert !topics(:first).approved? topics(:first).toggle!(:approved) assert topics(:first).approved? + topic = topics(:first) + topic.toggle(:approved) + assert !topic.approved? + topic.reload + assert topic.approved? end def test_reload diff --git a/activerecord/test/deprecated_finder_test.rb b/activerecord/test/deprecated_finder_test.rb index 0111cff3ac..348292870b 100755 --- a/activerecord/test/deprecated_finder_test.rb +++ b/activerecord/test/deprecated_finder_test.rb @@ -38,8 +38,8 @@ class FinderTest < Test::Unit::TestCase end def test_deprecated_find_on_conditions - assert Topic.find_on_conditions(1, "approved = 0") - assert_raises(ActiveRecord::RecordNotFound) { Topic.find_on_conditions(1, "approved = 1") } + assert Topic.find_on_conditions(1, ["approved = ?", false]) + assert_raises(ActiveRecord::RecordNotFound) { Topic.find_on_conditions(1, ["approved = ?", true]) } end def test_condition_interpolation diff --git a/activerecord/test/finder_test.rb b/activerecord/test/finder_test.rb index 35c96288fe..c87fc7f2f2 100644 --- a/activerecord/test/finder_test.rb +++ b/activerecord/test/finder_test.rb @@ -100,8 +100,8 @@ class FinderTest < Test::Unit::TestCase end def test_find_on_conditions - assert Topic.find(1, :conditions => "approved = 0") - assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => "approved = 1") } + assert Topic.find(1, :conditions => ["approved = ?", false]) + assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => ["approved = ?", true]) } end def test_condition_interpolation diff --git a/activerecord/test/fixtures/db_definitions/sqlite.sql b/activerecord/test/fixtures/db_definitions/sqlite.sql index d5879c31d8..1f8a2614dd 100644 --- a/activerecord/test/fixtures/db_definitions/sqlite.sql +++ b/activerecord/test/fixtures/db_definitions/sqlite.sql @@ -24,7 +24,7 @@ CREATE TABLE 'topics' ( 'bonus_time' TIME DEFAULT NULL, 'last_read' DATE DEFAULT NULL, 'content' TEXT, - 'approved' INTEGER DEFAULT 1, + 'approved' boolean DEFAULT 'f', 'replies_count' INTEGER DEFAULT 0, 'parent_id' INTEGER DEFAULT NULL, 'type' VARCHAR(255) DEFAULT NULL diff --git a/activerecord/test/fixtures/topics.yml b/activerecord/test/fixtures/topics.yml index 313999b1ee..6d4f5d800b 100644 --- a/activerecord/test/fixtures/topics.yml +++ b/activerecord/test/fixtures/topics.yml @@ -7,7 +7,7 @@ first: last_read: 2004-04-15 bonus_time: 2005-01-30t15:28:00.00+01:00 content: Have a nice day - approved: '0' + approved: false replies_count: 0 second: @@ -16,6 +16,6 @@ second: author_name: Mary written_on: 2003-07-15t15:28:00.00+01:00 content: Have a nice day - approved: '1' + approved: true replies_count: 2 parent_id: 1 |