Changeset 3092

Timestamp:

11/19/05 09:53:36 (3 years ago)

Author:

bitsweat

Message:

Correct boolean handling in generated reader methods. References #2945.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb (modified) (3 diffs)
• trunk/activerecord/test/abstract_unit.rb (modified) (1 diff)
• trunk/activerecord/test/base_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Correct boolean handling in generated reader methods.  #2945 [don.park@gmail.com, Stefan Kaes]
-
-* Don't generate read methods for columns whose names are not valid ruby method names.  #2946 [Stefan Kaes]

trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

@@ -60 +60 @@
-          when :date      then self.class.string_to_date(value)
-          when :binary    then self.class.binary_to_string(value)
-value == true or (value =~ /^t(rue)?$/i) == 0 or value.to_s == '1'
+self.class.value_to_boolean(value)
-          else value
-        end
@@ -76 +76 @@
-          when :date      then "#{self.class.name}.string_to_date(#{var_name})"
-          when :binary    then "#{self.class.name}.binary_to_string(#{var_name})"
-(#{var_name} == true or (#{var_name} =~ /^t(?:true)?$/i) == 0 or #{var_name}.to_s == '1'
+#{self.class.name}.value_to_boolean(#{var_name}
-          else nil
-        end
@@ -119 +119 @@
-        time_array[0] = 2000; time_array[1] = 1; time_array[2] = 1;
-        Time.send(Base.default_timezone, *time_array) rescue nil
+      end
+
+      # convert something to a boolean
+      def self.value_to_boolean(value)
+        return value if value==true || value==false
+        case value.to_s.downcase
+        when "true", "t", "1" then true
+        else false
+        end
-      end
-

trunk/activerecord/test/abstract_unit.rb

@@ -25 +25 @@
-    ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters.const_get(type))
-end
+
+#ActiveRecord::Base.logger = Logger.new(STDOUT)
+#ActiveRecord::Base.colorize_logging = false

trunk/activerecord/test/base_test.rb

@@ -207 +207 @@
-    topic.approved = false
-    assert !topic.approved?, "approved should be false"
+    topic.approved = "false"
+    assert !topic.approved?, "approved should be false"
+  end
+
+  def test_read_attribute_when_true
+    topic = topics(:first)
+    topic.approved = true
+    assert topic.approved?, "approved should be true"
+    topic.approved = "true"
+    assert topic.approved?, "approved should be true"
+  end
+
+  def test_read_write_boolean_attribute
+    topic = Topic.new
+    # puts ""
+    # puts "New Topic"
+    # puts topic.inspect
+    topic.approved = "false"
+    # puts "Expecting false"
+    # puts topic.inspect
+    assert !topic.approved, "approved should be false"
+    topic.approved = "false"
+    # puts "Expecting false"
+    # puts topic.inspect
+    assert !topic.approved, "approved should be false"
+    topic.approved = "true"
+    # puts "Expecting true"
+    # puts topic.inspect
+    assert topic.approved, "approved should be true"
+    topic.approved = "true"
+    # puts "Expecting true"
+    # puts topic.inspect
+    assert topic.approved, "approved should be true"
+    # puts ""
-  end
-