@@ -240,7 +240,8 @@ class RRDB create_database(time, safe_data.keys) end params = fields.map do |f| - safe_data[f].send(safe_data[f].to_s =~ /\A\d+\./ ? :to_f : :to_i) + digits = safe_data[f].to_s.delete("^0-9.") + digits.send(digits.include?(".") ? :to_f : :to_i) end rrdtool(:update, "'#{time.to_i}:#{params.join(':')}'") end lib/rrdb.rb @@ -48,6 +48,23 @@ class TestFetch < Test::Unit::TestCase end end + def test_all_fields_are_converted_to_numbers + RRDB.config( :reserve_fields => 0, + :database_start => Time.at(920804400), + :data_sources => { :comma => "GAUGE:600:U:U", + :kb => "GAUGE:600:U:U" }, + :round_robin_archives => %w[AVERAGE:0.5:1:24] ) + + @db.update(Time.at(920804700), :comma => "17,000", :kb => "10 kb") + @db.update(Time.at(920805000), :comma => "17,000", :kb => "10 kb") + + values = @db.fetch( :AVERAGE, + :start => Time.at(920804700), + :end => Time.at(920804700) ).values.first + assert_equal(17_000, values["comma"]) + assert_equal(10, values["kb"]) + end + def test_floats_are_supported RRDB.config( :reserve_fields => 0, :database_start => Time.at(920804400), test/tc_fetch.rb aea997aff6465e9579200a2e53a109d71fc1fdf0 James Edward Gray II james@graysoftinc.com http://github.com/JEG2/rrdb/commit/fe6d2fbda6ac57b9d685cf3a47468ef90f866988 fe6d2fbda6ac57b9d685cf3a47468ef90f866988 2008-07-21T07:40:15-07:00 2008-07-21T07:40:15-07:00 Fixing number field conversions. 7f619c6bfd8d2be2d7a0e4b4611246e9b8c2ef4b James Edward Gray II james@graysoftinc.com