0
@@ -35,16 +35,16 @@ module DataObjects
0
             BigDecimal.new(row[p])
0
           when 'MYSQL_TYPE_BIT'
0
             row[p] == '1'
0
-          when 'MYSQL_TYPE_TIMESTAMP'
0
-            row[p]
0
           when 'MYSQL_TYPE_DATE'
0
-            row[p]
0
+            Date.strptime(row[p], '%Y-%m-%d')
0
           when 'MYSQL_TYPE_TIME'
0
-            row[p]
0
+            Time.parse(row[p])
0
+          when 'MYSQL_TYPE_TIMESTAMP'
0
+            Time.parse(row[p])
0
           when 'MYSQL_TYPE_DATETIME'
0
-            row[p]
0
+            DateTime.strptime(row[p], '%Y-%m-%d %H:%M:%S')
0
           when 'MYSQL_TYPE_YEAR'
0
-            row[p]
0
+            row[p].to_i
0
           when 'MYSQL_TYPE_BLOB'
0
             row[p]
0
           when 'MYSQL_TYPE_TINY_BLOB'
0
@@ -53,13 +53,14 @@ module DataObjects
0
             row[p]
0
           when 'MYSQL_TYPE_LONG_BLOB'
0
             row[p]
0
+          when 'MYSQL_TYPE_TINY'
0
+            row[p] == 1   # Bool
0
           when 'MYSQL_TYPE_NULL'
0
             nil
0
           else row[p]
0
           end
0
 
0
           # Following not needed since already the right type
0
-          #when 'MYSQL_TYPE_TINY'        : row[p].to_i
0
           #when 'MYSQL_TYPE_SHORT'       : row[p].to_i
0
           #when 'MYSQL_TYPE_LONG'        : row[p].to_i
0
           #when 'MYSQL_TYPE_INT24'       : row[p].to_i

0
@@ -3,7 +3,11 @@ require File.join(File.dirname(__FILE__), '/spec_helper')
0
 describe DataObjects::Dbslayer::Reader do
0
   before :all do
0
     @reader_query = File.new(File.join(File.dirname(__FILE__), 'fixtures', 'reader_result.txt')).read
0
-    @reader = DataObjects::Dbslayer::Reader.new( JSON.parse(@reader_query)['RESULT'] )
0
+    @types_query  = File.new(File.join(File.dirname(__FILE__), 'fixtures', 'types_test.txt')).read
0
+    @reader       = DataObjects::Dbslayer::Reader.new( JSON.parse(@reader_query)['RESULT'] )
0
+
0
+    @types_reader = DataObjects::Dbslayer::Reader.new( JSON.parse(@types_query)['RESULT'] )
0
+    @types_reader.next!
0
   end
0
 
0
   it 'should return the fields' do
0
@@ -22,4 +26,39 @@ describe DataObjects::Dbslayer::Reader do
0
     end
0
     rows.should == 10
0
   end
0
+
0
+  it 'should be able to read a number' do
0
+    @types_reader.values[0].class.should == Fixnum
0
+    @types_reader.values[0].should == 1
0
+  end
0
+
0
+  it 'should be able to read Date types' do
0
+    @types_reader.values[1].class.should == Date
0
+    @types_reader.values[1].should == Date.new(2008, 5, 19)
0
+  end
0
+  
0
+  it 'should be able to read a Time(stamp) type' do
0
+    @types_reader.values[2].class.should == Time
0
+    @types_reader.values[2].should == Time.mktime(2008, 5, 19, 9, 46, 56)
0
+  end
0
+
0
+  it 'should be able to read a DateTime type' do
0
+    @types_reader.values[3].class.should == DateTime
0
+    @types_reader.values[3].should == DateTime.new(2008, 5, 19, 9, 48, 7)
0
+  end
0
+  
0
+  it 'should be able to read a basic time type' do
0
+    @types_reader.values[4].class.should == Time
0
+    @types_reader.values[4].should == Time.parse('09:48:07')
0
+  end
0
+
0
+  it 'should be able to read a year type' do
0
+    @types_reader.values[5].class.should == Fixnum
0
+    @types_reader.values[5].should == 2008
0
+  end
0
+
0
+  it 'should be able to read a boolean type' do
0
+    @types_reader.values[6].class.should == TrueClass
0
+    @types_reader.values[6].should == true
0
+  end
0
 end
0
\ No newline at end of file