[gnue] r8224 - trunk/gnue-samples/two-tier/schema

[jamest]

Author: jamest
Date: 2006-03-12 19:38:31 -0600 (Sun, 12 Mar 2006)
New Revision: 8224

Modified:
   trunk/gnue-samples/two-tier/schema/invoice.gsd
   trunk/gnue-samples/two-tier/schema/invoice_address.gsd
Log:
minor update to test schema


Modified: trunk/gnue-samples/two-tier/schema/invoice.gsd
===================================================================
--- trunk/gnue-samples/two-tier/schema/invoice.gsd      2006-03-12 19:58:09 UTC 
(rev 8223)
+++ trunk/gnue-samples/two-tier/schema/invoice.gsd      2006-03-13 01:38:31 UTC 
(rev 8224)
@@ -12,41 +12,13 @@
         <field name="tax_total"     type="number"   length="9" precision="2" 
nullable="N"/>
         <field name="tax_rate"      type="number"   length="9" precision="4" 
nullable="N"/>
         <field name="grand_total"   type="number"   length="9" precision="2" 
nullable="N"/>
-        
-        <field name="shipto_attention1" type="string" length="50" 
nullable="N"/>
-        <field name="shipto_attention2" type="string" length="50"/>
-        <field name="shipto_address1"   type="string" length="50" 
nullable="N"/>
-        <field name="shipto_address2"   type="string" length="50"/>
-        <field name="shipto_city"       type="string" length="30" 
nullable="N"/>
-        <field name="shipto_state"      type="string" length="2"  
nullable="N"/>
-        <field name="shipto_zip"        type="string" length="5"  
nullable="N"/>
-        
-        <field name="billto_attention1" type="string" length="50" 
nullable="N"/>
-        <field name="billto_attention2" type="string" length="50"/>
-        <field name="billto_address1"   type="string" length="50" 
nullable="N"/>
-        <field name="billto_address2"   type="string" length="50"/>
-        <field name="billto_city"       type="string" length="30" 
nullable="N"/>
-        <field name="billto_state"      type="string" length="2"  
nullable="N"/>
-        <field name="billto_zip"        type="string" length="5"  
nullable="N"/>
       </fields>
       
       <primarykey name="pk_invoice_invoice_id">
         <pkfield name="invoice_id"/>
       </primarykey>
       
-      <constraints>
-        <foreignkey name="fk_invoice_shipto_csz"  references="zipcode">
-          <fkfield name="shipto_city"  references="city"/>
-          <fkfield name="shipto_state" references="state"/>
-          <fkfield name="shipto_zip"   references="zip"/>
-        </foreignkey>
-        
-        <foreignkey name="fk_invoice_billto_csz"  references="zipcode">
-          <fkfield name="billto_city"  references="city"/>
-          <fkfield name="billto_state" references="state"/>
-          <fkfield name="billto_zip"   references="zip"/>
-        </foreignkey>
-      </constraints>
+      <constraints />
     </table>
   </tables>
 
@@ -62,20 +34,6 @@
         <value field="tax_total">14</value>
         <value field="tax_rate">10</value>
         <value field="grand_total">154</value>
-        
-        <value field="shipto_attention1">JOHN DOE</value>
-        <value field="shipto_attention2">GNUECORP</value>
-        <value field="shipto_address1">1234 1ST STREET</value>
-        <value field="shipto_address2">SUITE A</value>
-        <value field="shipto_city">MANHATTAN</value>
-        <value field="shipto_state">KS</value>
-        <value field="shipto_zip">66502</value>
-        
-        <value field="billto_attention1">JANE SMITH</value>
-        <value field="billto_address1">6789 N. MAIN</value>
-        <value field="billto_city" >ELLSWORTH</value>
-        <value field="billto_state">KS</value>
-        <value field="billto_zip">67439</value>
         </row>
       </rows>
     </tabledata>

Modified: trunk/gnue-samples/two-tier/schema/invoice_address.gsd
===================================================================
--- trunk/gnue-samples/two-tier/schema/invoice_address.gsd      2006-03-12 
19:58:09 UTC (rev 8223)
+++ trunk/gnue-samples/two-tier/schema/invoice_address.gsd      2006-03-13 
01:38:31 UTC (rev 8224)
@@ -10,7 +10,7 @@
         <field name="address_id"         type="number"   nullable="N"/>
         <field name="attention1"         type="string"   length="50" 
nullable="N"/>
         <field name="attention2"         type="string"   length="50"/>
-        <field name="address_type"       type="string"   length="5" 
nullable="N"/>
+        <field name="type"               type="string"   length="5" 
nullable="N"/>
       </fields>
       
       <primarykey name="pk_invoice_address_invoice_address_id">
@@ -27,7 +27,7 @@
         </foreignkey>
         
         <foreignkey name="fk_invoice_address_type"  
references="lk_address_type">
-          <fkfield  name="address_type"   references="type"/>
+          <fkfield  name="type"   references="type"/>
         </foreignkey>
       </constraints>
     </table>
@@ -42,16 +42,15 @@
           <value field="address_id">0</value>
           <value field="attention1">JOHN DOE</value>
           <value field="attention2">GNUECORP</value>
-          <value field="address_type">SHIP</value>
+          <value field="type">SHIP</value>
         </row>
-<!--        <row>
+        <row>
           <value field="invoice_address_id">1</value>
           <value field="invoice_id">1</value>
           <value field="address_id">1</value>
           <value field="attention1">JANE SMITH</value>
-          <value field="address_type">BILL</value>
+          <value field="type">BILL</value>
         </row>
-        -->
       </rows>
     </tabledata>
   </data>