@@ -615,7 +615,7 @@ module DataMapper tm.map(DM::Discriminator).to('VARCHAR').with(:size => Property::DEFAULT_LENGTH) tm.map(BigDecimal).to('DECIMAL').with(:precision => Property::DEFAULT_PRECISION, :scale => Property::DEFAULT_SCALE_BIGDECIMAL) tm.map(Float).to('FLOAT').with(:precision => Property::DEFAULT_PRECISION) - tm.map(DateTime).to('DATETIME') + tm.map(DateTime).to('TIMESTAMP') tm.map(Date).to('DATE') tm.map(Time).to('TIMESTAMP') tm.map(TrueClass).to('BOOLEAN') lib/dm-core/adapters/data_objects_adapter.rb @@ -124,6 +124,8 @@ module DataMapper tm.map(Integer).to('INT').with(:size => 11) tm.map(TrueClass).to('TINYINT').with(:size => 1) # TODO: map this to a BIT or CHAR(0) field? tm.map(Object).to('TEXT') + tm.map(DateTime).to('DATETIME') + tm.map(Time).to('DATETIME') end end end # module ClassMethods lib/dm-core/adapters/mysql_adapter.rb @@ -174,9 +174,9 @@ module DataMapper # TODO: move to dm-more/dm-migrations def type_map @type_map ||= TypeMap.new(super) do |tm| - tm.map(DateTime).to('TIMESTAMP') - tm.map(Integer).to('INT4') - tm.map(Float).to('FLOAT8') + tm.map(Integer).to('INTEGER') + tm.map(BigDecimal).to('NUMERIC').with(:precision => Property::DEFAULT_PRECISION, :scale => Property::DEFAULT_SCALE_BIGDECIMAL) + tm.map(Float).to('DOUBLE PRECISION') end end end # module ClassMethods lib/dm-core/adapters/postgres_adapter.rb @@ -105,7 +105,7 @@ if HAS_SQLITE3 # :class => [ Class, 'VARCHAR(50)', false, 'Class', 'Class', false ], :big_decimal => [ BigDecimal, 'DECIMAL(2,1)', false, '1.1', BigDecimal('1.1'), false ], :float => [ Float, 'FLOAT(2,1)', false, '1.1', 1.1, false ], - :date_time => [ DateTime, 'DATETIME', false, NOW.strftime('%Y-%m-%d %H:%M:%S'), NOW, false ], + :date_time => [ DateTime, 'TIMESTAMP', false, NOW.strftime('%Y-%m-%d %H:%M:%S'), NOW, false ], :time_1 => [ Time, 'TIMESTAMP', false, TIME_STRING_1, TIME_1, false ], #SQLite pads out the microseconds to the full 6 digits no matter what the value is - we simply pad up the zeros needed :time_2 => [ Time, 'TIMESTAMP', false, TIME_STRING_2.dup << '00000', TIME_2, false ], @@ -219,10 +219,10 @@ if HAS_MYSQL :big_decimal => [ BigDecimal, 'DECIMAL(2,1)', false, '1.1', BigDecimal('1.1'), false ], :float => [ Float, 'FLOAT(2,1)', false, '1.1', 1.1, false ], :date_time => [ DateTime, 'DATETIME', false, NOW.strftime('%Y-%m-%d %H:%M:%S'), NOW, false ], - :time_1 => [ Time, 'TIMESTAMP', false, TIME_1.strftime('%Y-%m-%d %H:%M:%S'), TIME_1, false ], - :time_2 => [ Time, 'TIMESTAMP', false, TIME_2.strftime('%Y-%m-%d %H:%M:%S'), TIME_2, false ], - :time_3 => [ Time, 'TIMESTAMP', false, TIME_3.strftime('%Y-%m-%d %H:%M:%S'), TIME_3 , false ], - :time_4 => [ Time, 'TIMESTAMP', false, TIME_4.strftime('%Y-%m-%d %H:%M:%S'), TIME_4 , false ], + :time_1 => [ Time, 'DATETIME', false, TIME_1.strftime('%Y-%m-%d %H:%M:%S'), TIME_1, false ], + :time_2 => [ Time, 'DATETIME', false, TIME_2.strftime('%Y-%m-%d %H:%M:%S'), TIME_2, false ], + :time_3 => [ Time, 'DATETIME', false, TIME_3.strftime('%Y-%m-%d %H:%M:%S'), TIME_3 , false ], + :time_4 => [ Time, 'DATETIME', false, TIME_4.strftime('%Y-%m-%d %H:%M:%S'), TIME_4 , false ], :object => [ Object, 'TEXT', true, nil, nil, false ], :discriminator => [ DM::Discriminator, 'VARCHAR(50)', false, nil, EveryType, false ], } spec/integration/auto_migrations_spec.rb 2fffaf5c568e2cf6ad38d1d11a4af9af2b7e89fb Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/dkubb/dm-core/commit/b2fd79007851afd338dcb76411640608c593242d b2fd79007851afd338dcb76411640608c593242d 2009-04-13T11:51:55-07:00 2009-04-13T11:51:55-07:00 Use proper columns for DateTime and Time types with auto-migration c7c1349640f9015c75788d380465808c04139770 Dan Kubb dan.kubb@autopilotmarketing.com