X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;ds=sidebyside;f=sql%2Fschema.dot;h=9fb24285cf092e8e83c9a9d1308bd57f62c3e12e;hb=53b9dc59fa5aabe9c55b109d158c5db379955013;hp=2a88bf6072a955f82ac12042a9eb313b59de2526;hpb=c0138a3e56518fd73dfe4d93c30d8e36ce062d87;p=eq%2F.git

diff --git a/sql/schema.dot b/sql/schema.dot
index 2a88bf6..9fb2428 100644
--- a/sql/schema.dot
+++ b/sql/schema.dot
@@ -19,11 +19,15 @@ digraph schema {
     shape = "record"
   ];
   calling       [
-    label = "calling||<n> name|<o> organization|<p> position|<s> sustained"
+    label = "calling||<i> individual|<o> organization|<p> position|<s> sustained"
+    shape = "record"
+  ];
+  companion   [
+    label = "companion||<c> companion|<i> individual|<cp> companionship|<sp> scheduling_priority|<v> valid"
     shape = "record"
   ];
   companionship   [
-    label = "companionship||<c> companionship|<i> individual|<d> district|<sp> scheduling_priority|<v> valid"
+    label = "companionship||<c> companionship|<d> district|<v> valid"
     shape = "record"
   ];
   district      [
@@ -31,7 +35,7 @@ digraph schema {
     shape = "record"
   ];
   individual   [
-    label = "individual||<i> individual|<id> mls_id|<n> name|<a> address|<p> phone|<em> email|<hh> hh position|<pr> priesthood|<st> steward|<sp> scheduling_priority|<a> attending|<v> valid"
+    label = "individual||<i> individual|<id> mls_id|<n> name|<fn> fullname|<a> address|<p> phone|<em> email|<hh> hh position|<pr> priesthood|<st> steward|<sp> scheduling_priority|<a> attending|<v> valid"
     shape = "record"
   ];
   family   [
@@ -47,7 +51,7 @@ digraph schema {
     shape = "record"
   ];
   presidency    [
-    label = "presidency||<p> presidency||<i> individual|<d> district|<em> email|<pr> president|<cn> counselor|<sec> secreatary|<v> valid"
+    label = "presidency||<p> presidency|<i> individual|<d> district|<em> email|<pr> president|<cn> counselor|<sec> secreatary|<v> valid"
     shape = "record"
   ];
   visit   [
@@ -86,10 +90,14 @@ digraph schema {
   appointment:i   -> individual:i
 
   attendance:i    -> individual:i
+  
+  calling:i       -> individual:i
+
+  companion:cp    -> companionship:c
+  companion:i     -> individual:i
+  companion:sp    -> scheduling_priority:sp
 
-  companionship:i -> individual:i
   companionship:d -> district:d
-  companionship:sp -> scheduling_priority:sp
   
   district:s      -> individual:i