Changeset 20180 for lang/ruby

Timestamp:

09/29/08 12:10:18 (2 months ago)

Author:

authorNari

Message:

table foreingkeys name to singularize

Location:

lang/ruby/ymldot

Files:

• lib/ymldot.rb (modified) (5 diffs)
• spec/ymldot_spec.rb (modified) (1 diff)

lang/ruby/ymldot/lib/ymldot.rb

@@ -1 +1 @@
 require 'yaml'
 require 'pp'
+require 'util'
 
 class Entity
@@ -144 +145 @@
   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
@@ -151 +152 @@
   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
@@ -162 +163 @@
       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
@@ -178 +179 @@
   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] }

lang/ruby/ymldot/spec/ymldot_spec.rb

@@ -253 +253 @@
   "bar" [shape=record, label="{bar|fuge\l}"]
   "baz" [shape=record, label="{baz|gage\l}"]
-  "foo" [shape=record, label="{foo|entityID(FK)\lhoge\lentity_type(type)\l}"]
+  "foo" [shape=record, label="{foo|entityID(FK)\lentity_type(type)\lhoge\l}"]
 
   "baf" -> "foo" [arrowtail=none arrowhead=dot headlabel="1" taillabel="1"]