godfat-dm-mapping 0.6.1 → 0.6.2

data/CHANGES

@@ -1,5 +1,9 @@
 = dm-mapper changes history
 
+=== dm-mapping 0.6.2, 2008-08-30
+* mapping more data types for mysql.
+* don't map TINYINT to TrueClass with mysql, skip it in type_map.
+
 === dm-mapping 0.6.1, 2008-08-22
 * gem 'dm-core', '>=0.9.3' instead of '=0.9.3'
 

data/README

@@ -1,4 +1,4 @@
-= dm-mapping 0.6.1
+= dm-mapping 0.6.2
 by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
   godfat (XD) godfat.org
 
@@ -94,7 +94,7 @@ by Lin Jen-Shin (a.k.a. godfat-真常[http://godfat.org])
 
 == REQUIREMENTS:
 
-* dm-core 0.9.3
+* dm-core 0.9.3 or later
 * at least one do_* adapter (currently supports sqlite3 and mysql)
 
 == INSTALL:

data/dm-mapping.gemspec

@@ -1,11 +1,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-mapping}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (a.k.a. godfat \347\234\237\345\270\270)"]
-  s.date = %q{2008-08-22}
+  s.date = %q{2008-08-30}
   s.description = %q{DataMapper plugin that helps you manipulate an existing database. It creates mappings between existing columns and model's properties.}
   s.email = %q{godfat (XD) godfat.org}
   s.extra_rdoc_files = ["CHANGES", "LICENSE", "NOTICE", "README", "TODO", "dm-mapping.gemspec"]

data/lib/dm-mapping/adapters/abstract_adapter.rb

@@ -1,4 +1,6 @@
 
+require 'dm-mapping/type_map'
+
 module DataMapper
   module Adapters
     class AbstractAdapter

data/lib/dm-mapping/adapters/mysql_adapter.rb

@@ -1,6 +1,5 @@
 
 require 'dm-mapping/adapters/abstract_adapter'
-require 'dm-mapping/type_map'
 
 module DataMapper
   module Adapters
@@ -43,15 +42,17 @@ module DataMapper
         end
 
         def dmm_lookup_primitive primitive
-          case primitive.upcase
-            when 'TINYINT', 'SMALLINT', 'MEDIUMINT', 'BIGINT', 'YEAR'; Integer
-            when 'DOUBLE'; BigDecimal
-            when 'BOOL'; TrueClass
-            when 'CHAR', 'ENUM', 'SET', 'TINYBLOB', 'MEDIUMBLOB',
-                 'BLOB', 'LONGBLOB', 'BINARY', 'VARBINARY'; String
-            when 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT'; DM::Text
-            else super(primitive)
-          end
+          p = primitive.upcase
+
+          return Integer    if p == 'YEAR'
+          return Integer    if p =~          /\w*INT(EGER)?( SIGNED| UNSIGNED)?( ZEROFILL)?/
+          return BigDecimal if p =~ /(DOUBLE|FLOAT|DECIMAL)( SIGNED| UNSIGNED)?( ZEROFILL)?/
+          return String     if p =~ /\w*BLOB|\w*BINARY|ENUM|SET|CHAR/
+          return DM::Text   if p =~ /\w*TEXT/
+          return TrueClass  if %w[BOOL BOOLEAN].member?(p)
+          return Time       if p == 'TIME'
+
+          super(primitive)
         end
       end
     end

data/lib/dm-mapping/adapters/sqlite3_adapter.rb

@@ -1,6 +1,5 @@
 
 require 'dm-mapping/adapters/abstract_adapter'
-require 'dm-mapping/type_map'
 
 module DataMapper
   module Adapters

data/lib/dm-mapping/type_map.rb

@@ -13,7 +13,9 @@ module DataMapper
         [Integer, Float, BigDecimal,
          String, TrueClass, FalseClass,
          DateTime, Date, Time,
-         DM::Text, DM::Boolean].member?(type)
+         DM::Text, DM::Boolean].member?(type) &&
+        # TINYINT size 1 shouldn't map to TrueClass
+        chain.attributes[:size] != 1
       } or lookup_primitive(primitive, type_map.parent)
     end
   end

data/lib/dm-mapping/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Mapping
-    VERSION = '0.6.1' unless defined?(DataMapper::Mapping::VERSION)
+    VERSION = '0.6.2' unless defined?(DataMapper::Mapping::VERSION)
   end
 end

data/test/test_dm-mapping.rb

@@ -2,9 +2,12 @@
 require 'test/unit'
 require 'test/abstract'
 
-require 'dm-core/adapters/sqlite3_adapter'
-require 'dm-core/adapters/mysql_adapter'
-require 'dm-core/adapters/postgres_adapter'
+%w[sqlite3 mysql postgres].each{ |adapter|
+  begin
+    require "dm-core/adapters/#{adapter}_adapter"
+  rescue LoadError
+  end
+}
 
 class Sqlite3Test < Test::Unit::TestCase
   include Abstract

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: godfat-dm-mapping
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - "Lin Jen-Shin (a.k.a. godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-22 00:00:00 -07:00
+date: 2008-08-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency