dm-mapping 0.6.2 → 0.7.0

data/CHANGES

@@ -1,5 +1,12 @@
 = dm-mapper changes history
 
+=== dm-mapping 0.7.0, 2008-09-01
+* feature added
+ - added postgres support.
+* bug fixed
+ - fixed key mapping in mysql adapter. PRI and MUL are all keys.
+ - use DM::Text.size as default text size in sqlite3.
+
 === 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.

data/README

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

data/TODO

@@ -1,5 +1,5 @@
 = dm-mapping todo list
 
 * better doc...
-* 0.7 postgresql adapter
+* 0.7.1 for more data types for postgresql adapter
 * 0.8 automatic determine model relationship

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

@@ -32,7 +32,7 @@ module DataMapper
 
         def dmm_attributes field, attrs = {}
             attrs[:serial] = true if field.extra == 'auto_increment'
-            attrs[:key] = true if field.column_key == 'PRI'
+            attrs[:key] = true if field.column_key != ''
             attrs[:nullable] = field.is_nullable == 'YES'
             attrs[:default] = field.column_default if field.column_default
             attrs[:size] = field.character_maximum_length if

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

@@ -0,0 +1,73 @@
+
+require 'dm-mapping/adapters/abstract_adapter'
+
+module DataMapper
+  module Adapters
+    class PostgresAdapter < DataObjectsAdapter #:nodoc: all
+      module Migration
+        def storages
+          sql = <<-SQL.compress_lines
+            SELECT table_name FROM "information_schema"."tables"
+            WHERE table_schema = current_schema()
+          SQL
+
+          query(sql)
+        end
+
+        private
+        def dmm_query_storage storage
+          sql = <<-SQL.compress_lines
+            SELECT column_name FROM "information_schema"."key_column_usage"
+            WHERE table_schema = current_schema() AND table_name = ?
+          SQL
+
+          keys = query(sql, storage).to_set
+
+          sql = <<-SQL.compress_lines
+            SELECT column_name, column_default, is_nullable,
+                   character_maximum_length, udt_name
+            FROM "information_schema"."columns"
+            WHERE table_schema = current_schema() AND table_name = ?
+          SQL
+
+          query(sql, storage).map{ |struct|
+            struct.instance_eval <<-END_EVAL
+              def key?
+                #{keys.member?(struct.column_name)}
+              end
+            END_EVAL
+            struct
+          }
+        end
+
+        def dmm_field_name field
+          field.column_name
+        end
+
+        def dmm_primitive field
+          field.udt_name
+        end
+
+        def dmm_attributes field, attrs = {}
+          # strip data type
+          field.column_default.gsub!(/(.*?)::[\w\s]*/, '\1') if field.column_default
+
+          attrs[:serial] = true if field.column_default =~ /nextval\('\w+_seq'\)/
+          attrs[:key] = true if field.key?
+          attrs[:nullable] = field.is_nullable == 'YES'
+          # strip string quotation
+          attrs[:default] = field.column_default.gsub(/^'(.*?)'$/, '\1') if
+            field.column_default && !attrs[:serial]
+
+          if field.character_maximum_length
+            attrs[:size] = field.character_maximum_length
+          elsif field.udt_name.upcase == 'TEXT'
+            attrs[:size] = DM::Text.size
+          end
+
+          attrs
+        end
+      end
+    end
+  end
+end

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

@@ -36,7 +36,7 @@ module DataMapper
           attrs[:default] = field.dflt_value[1..-2] if field.dflt_value
 
           if field.type.upcase == 'TEXT'
-            attrs[:size] = 65535
+            attrs[:size] = DM::Text.size
           else
             ergo = field.type.match(/\((\d+)\)/)
             size = ergo && ergo[1].to_i

data/lib/dm-mapping/version.rb

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

data/test/test_dm-mapping.rb

@@ -9,18 +9,31 @@ require 'test/abstract'
   end
 }
 
+# cost 1 second to run
 class Sqlite3Test < Test::Unit::TestCase
   include Abstract
 
   def setup_data_mapper
     DataMapper.setup(:default, 'sqlite3:tmp.sqlite3')
   end
-end
+end if defined?(DataObjects::Sqlite3)
 
+
+# cost 2 seconds to run
 class MysqlTest < Test::Unit::TestCase
   include Abstract
 
   def setup_data_mapper
     DataMapper.setup(:default, 'mysql://dm-mapping:godfat@localhost/dm-mapping')
   end
-end
+end if defined?(DataObjects::Mysql)
+
+
+# cost 3 seconds to run
+class PostgresTest < Test::Unit::TestCase
+  include Abstract
+
+  def setup_data_mapper
+    DataMapper.setup(:default, 'postgres://dm-mapping:godfat@localhost/dm-mapping')
+  end
+end if defined?(DataObjects::Postgres)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-mapping
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.7.0
 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-30 00:00:00 +08:00
+date: 2008-09-01 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,7 @@ files:
 - lib/dm-mapping.rb
 - lib/dm-mapping/adapters/abstract_adapter.rb
 - lib/dm-mapping/adapters/mysql_adapter.rb
+- lib/dm-mapping/adapters/postgres_adapter.rb
 - lib/dm-mapping/adapters/sqlite3_adapter.rb
 - lib/dm-mapping/model.rb
 - lib/dm-mapping/type_map.rb