0
@@ -21,7 +21,7 @@ module DataMapper
0
       def avg(respository, property, query)
0
         parameters = query.parameters
0
         avg = query(aggregate_value_statement(:avg, property, query), *parameters).first
0
-        property.typecast(avg)
0
+        property.type == Fixnum ? avg.to_f : property.typecast(avg)
0
       end
0
 
0
       def sum(respository, property, query)

0
@@ -188,7 +188,8 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
0
 
0
       describe 'with a property name' do
0
         it 'should provide the average value of an Integer property' do
0
-          Dragon.avg(:toes_on_claw).should == 4
0
+          Dragon.avg(:toes_on_claw).should be_kind_of(Float)
0
+          Dragon.avg(:toes_on_claw).should == 4.0
0
         end
0
 
0
         it 'should provide the average value of a Float property' do
0
@@ -205,7 +206,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
0
         end
0
 
0
         it 'should provide the average value when conditions provided' do
0
-          Dragon.avg(:toes_on_claw, :is_fire_breathing => true).should  == 4
0
+          Dragon.avg(:toes_on_claw, :is_fire_breathing => true).should  == 4.5
0
           Dragon.avg(:toes_on_claw, :is_fire_breathing => false).should == 3
0
         end
0
       end