ymldot 0.0.1 → 0.0.2

data/bin/ymldot

@@ -9,7 +9,7 @@ end
 require 'ymldot'
 require 'optparse'
 
-Version = "0.0.1"
+Version = "0.0.2"
 is_output = false
 opt = OptionParser.new
 opt.version = Version

data/lib/ymldot.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'pp'
+require 'util'
 
 class Entity
   def initialize(name, dependent, columns = [])
@@ -143,14 +144,14 @@ EOS
 
   def eval_relation_has_many(keys, tname)
     keys.each do |rel|
-      @entity_dict[rel].foreignkeys << "#{tname}ID(FK)"
+      @entity_dict[rel].foreignkeys << "#{singularize(tname)}ID(FK)"
       @many_relations << {:self => @entity_dict[tname], :have => @entity_dict[rel]}
     end
   end
 
   def eval_relation_has_one(keys, tname)
     keys.each do |rel|
-      @entity_dict[rel].foreignkeys << "#{tname}ID(FK)"
+      @entity_dict[rel].foreignkeys << "#{singularize(tname)}ID(FK)"
       @one_relations << {:self => @entity_dict[tname], :have => @entity_dict[rel]}
     end
   end
@@ -161,8 +162,8 @@ EOS
       return if @entity_dict.has_key? join_tname
       join_tname = "#{tname}_#{rel}"
       @entity_dict[join_tname] ||= Entity.new(join_tname, true)
-      @entity_dict[join_tname].foreignkeys << "#{tname}ID(FK)"
-      @entity_dict[join_tname].foreignkeys << "#{rel}ID(FK)"
+      @entity_dict[join_tname].foreignkeys << "#{singularize(tname)}ID(FK)"
+      @entity_dict[join_tname].foreignkeys << "#{singularize(rel)}ID(FK)"
 
       # make new category
       keys = []
@@ -177,8 +178,8 @@ EOS
 
   def eval_relation_polymorphic(keys, tname)
     keys.each do |rel|
-      @entity_dict[tname].foreignkeys << "#{rel["name"]}ID(FK)" if key = rel["name"]
-      @entity_dict[tname].columns.unshift "#{rel["type"]}(type)" if key = rel["type"]
+      @entity_dict[tname].foreignkeys << "#{singularize(rel["name"])}ID(FK)" if key = rel["name"]
+      @entity_dict[tname].columns.unshift "#{singularize(rel["type"])}(type)" if key = rel["type"]
       rel["tables"].each do |t|
         @one_relations << {:self => @entity_dict[t], :have => @entity_dict[tname] }
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ymldot
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - nari
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 +09:00
+date: 2008-09-29 00:00:00 +09:00
 default_executable: 
 dependencies: []