[gnue-contrib] r266 - address/schema

[reinhard]

Author: reinhard
Date: 2007-04-10 09:02:23 -0500 (Tue, 10 Apr 2007)
New Revision: 266

Modified:
   address/schema/schema.gsd
Log:
Cleanup of schema.


Modified: address/schema/schema.gsd
===================================================================
--- address/schema/schema.gsd   2007-04-09 22:29:27 UTC (rev 265)
+++ address/schema/schema.gsd   2007-04-10 14:02:23 UTC (rev 266)
@@ -4,100 +4,91 @@
   <tables>
     <table name="company">
       <fields>
-        <field name="id" type="number" length="8" nullable="False"
-          defaultwith="serial" />
-
-        <field name="matchcode" type="string" length="20" />
-        <field name="name1" type="string" length="64" />
-        <field name="name2" type="string" length="64" />
-        <field name="street" type="string" length="64" />
-        <field name="country" type="string" length="4" />
-        <field name="zip" type="string" length="10" />
-        <field name="city" type="string" length="64" />
-        <field name="vatid" type="string" length="18"  />
-        <field name="compreg" type="string" length="32" />
-        <field name="phone" type="string" length="64"  />
-        <field name="fax" type="string" length="64"  />
-        <field name="web" type="string" length="64" />
-        <field name="email" type="string" length="64" />
-        <field name="customer" type="string" length="20" />
-        <field name="bwcustomer" type="string" length="16" />
-        <field name="bwsupplier" type="string" length="16" />
-        <field name="shipment" type="string" length="64" />
-        <field name="category" type="number" length="8" />
-
-        <field name="memo" type="string" length="2000" />
+        <field name="id"         type="number" length="8" nullable="False" 
defaultwith="serial"/>
+        <field name="matchcode"  type="string" length="16"/>
+        <field name="name1"      type="string" length="64"/>  <!-- 32? -->
+        <field name="name2"      type="string" length="64"/>  <!-- 32? -->
+        <field name="street"     type="string" length="64"/>  <!-- 32? -->
+        <field name="country"    type="string" length="4"/>
+        <field name="zip"        type="string" length="8"/>
+        <field name="city"       type="string" length="64"/>  <!-- 32? -->
+        <field name="vatid"      type="string" length="16"/>
+        <field name="compreg"    type="string" length="32"/>  <!-- 16? -->
+        <field name="phone"      type="string" length="64"/>  <!-- 32? -->
+        <field name="fax"        type="string" length="64"/>  <!-- 32? -->
+        <field name="web"        type="string" length="64"/>  <!-- 32? -->
+        <field name="email"      type="string" length="64"/>  <!-- 32? -->
+        <field name="customer"   type="string" length="16"/>
+        <field name="bwcustomer" type="string" length="16"/>
+        <field name="bwsupplier" type="string" length="16"/>
+        <field name="shipment"   type="string" length="64"/>  <!-- 32? -->
+        <field name="category"   type="number" length="8"/>
+        <field name="memo"       type="string"/>
       </fields>
 
       <primarykey name="pk_company">
-        <pkfield name="id" />
+        <pkfield name="id"/>
       </primarykey>
 
       <constraints>
         <foreignkey name="fk_company_has_category" references="category">
-          <fkfield name="category" references="id" />
+          <fkfield name="category" references="id"/>
         </foreignkey>
       </constraints>
     </table>
 
     <table name="contact">
       <fields>
-        <field name="id" type="number" length="8" nullable="False"
-          defaultwith="serial" />
-        <field name="company" type="string" length="8" nullable="False" />
-
-        <field name="salutation" type="number" length="8" />
-        <field name="title" type="string" length="21" />
-        <field name="firstname" type="string" length="32" />
-        <field name="surname" type="string" length="32" />
-        <field name="department" type="string" length="32" />
-        <field name="duty" type="string" length="32" />
-        <field name="phone1" type="string" length="32" />
-        <field name="phone2" type="string" length="32" />
-        <field name="fax" type="string" length="32" />
-        <field name="email" type="string" length="64" />
-        <field name="memo" type="string" length="2000" />
+        <field name="id"         type="number" length="8" nullable="False" 
defaultwith="serial"/>
+        <field name="company"    type="string" length="8" nullable="False"/>
+        <field name="salutation" type="number" length="8"/>
+        <field name="title"      type="string" length="32"/>
+        <field name="firstname"  type="string" length="32"/>
+        <field name="surname"    type="string" length="32"/>
+        <field name="department" type="string" length="32"/>
+        <field name="duty"       type="string" length="32"/>
+        <field name="phone1"     type="string" length="32"/>
+        <field name="phone2"     type="string" length="32"/>
+        <field name="fax"        type="string" length="32"/>
+        <field name="email"      type="string" length="32"/>
+        <field name="memo"       type="string"/>
       </fields>
 
       <primarykey name="pk_contact">
-        <pkfield name="id" />
+        <pkfield name="id"/>
       </primarykey>
 
       <constraints>
-        <foreignkey name="fk_company_has_contacts" references="company" >
-          <fkfield name="company" references="id" />
+        <foreignkey name="fk_company_has_contacts" references="company">
+          <fkfield name="company" references="id"/>
         </foreignkey>
 
         <foreignkey name="fk_contact_has_salutation" references="salutation">
-          <fkfield name="salutation" references="id" />
+          <fkfield name="salutation" references="id"/>
         </foreignkey>
       </constraints>
     </table>
 
     <table name="category">
       <fields>
-        <field name="id" type="number" length="8" nullable="False"
-          defaultwith="serial" />
-        <field name="text" type="string" length="32" default="(neu/zuordnen)" 
/>
+        <field name="id"   type="number" length="8"  nullable="False" 
defaultwith="serial"/>
+        <field name="text" type="string" length="32"/>
       </fields>
 
       <primarykey name="pk_category">
-        <pkfield name="id" />
+        <pkfield name="id"/>
       </primarykey>
     </table>
 
     <table name="salutation">
       <fields>
-        <field name="id" type="number" length="8" nullable="False"
-          defaultwith="serial" />
-        <field name="text" type="string" length="15" />
+        <field name="id"   type="number" length="8" nullable="False" 
defaultwith="serial"/>
+        <field name="text" type="string" length="16"/>
       </fields>
 
       <primarykey name="pk_salutation">
-        <pkfield name="id" />
+        <pkfield name="id"/>
       </primarykey>
     </table>
-
   </tables>
-
 </schema>