[gnue] r7638 - in trunk/gnue-common: doc scripts

[johannes]

Author: johannes
Date: 2005-06-22 06:29:20 -0500 (Wed, 22 Jun 2005)
New Revision: 7638

Modified:
   trunk/gnue-common/doc/gnue-schema.dtd
   trunk/gnue-common/scripts/gnuedtd
Log:
Changed import structure, updated gsd-dtd


Modified: trunk/gnue-common/doc/gnue-schema.dtd
===================================================================
--- trunk/gnue-common/doc/gnue-schema.dtd       2005-06-22 09:50:24 UTC (rev 
7637)
+++ trunk/gnue-common/doc/gnue-schema.dtd       2005-06-22 11:29:20 UTC (rev 
7638)
@@ -1,7 +1,7 @@
-<!-- GNUe Schema DTD (Version 0.5.14) -->
+<!-- GNUe Schema DTD (Version 0.5.14.99) -->
 
 <!--
-     Copyright 2001-2004 Free Software Foundation
+     Copyright 2001-2005 Free Software Foundation
 
      This file is part of GNU Enterprise.
 
@@ -47,7 +47,7 @@
 <!-- ================= -->
 <!-- Top level element -->
 <!-- ================= -->
-<!ELEMENT schema (data?, description?, tables?)>
+<!ELEMENT schema (data?, description?, tables*)>
 <!ATTLIST schema author %text; #IMPLIED>
 <!ATTLIST schema description %text; #IMPLIED>
 <!ATTLIST schema title %text; #IMPLIED>
@@ -62,6 +62,8 @@
 <!ELEMENT description EMPTY>
 
 <!ELEMENT tables (import-table*, table*)>
+<!ATTLIST tables name %name; "tables">
+<!ATTLIST tables type %name; "table">
 
 
 <!-- ====================== -->
@@ -72,7 +74,7 @@
 <!ATTLIST import-tabledata name %name; #REQUIRED>
 <!ATTLIST import-tabledata tablename %name; #REQUIRED>
 
-<!ELEMENT tabledata (definition?, rows?)>
+<!ELEMENT tabledata (primarykey?, rows?)>
 <!ATTLIST tabledata name %name; #REQUIRED>
 <!ATTLIST tabledata tablename %name; #REQUIRED>
 
@@ -85,18 +87,21 @@
 <!ATTLIST import-table library %name; #REQUIRED>
 <!ATTLIST import-table action (create | extend) "create">
 <!ATTLIST import-table description %text; #IMPLIED>
+<!ATTLIST import-table type %name; #IMPLIED>
 
 <!ELEMENT table (constraints?, fields?, import-fields?, indexes?, 
                  primarykey?)>
 <!ATTLIST table name ID #REQUIRED>
 <!ATTLIST table action (create | extend) "create">
 <!ATTLIST table description %text; #IMPLIED>
+<!ATTLIST table type %name; #IMPLIED>
 
 
 <!-- =========================== -->
 <!-- Child elements of tabledata -->
 <!-- =========================== -->
-<!ELEMENT definition (column*)>
+<!ELEMENT primarykey (pkfield*)>
+<!ATTLIST primarykey name %name; #REQUIRED>
 
 <!ELEMENT rows (row*)>
 
@@ -104,7 +109,7 @@
 <!-- ======================= -->
 <!-- Child elements of table -->
 <!-- ======================= -->
-<!ELEMENT constraints (constraint*)>
+<!ELEMENT constraints (foreignkey*)>
 
 <!ELEMENT fields (field*, import-field*)>
 
@@ -113,17 +118,12 @@
 
 <!ELEMENT indexes (index*)>
 
-<!ELEMENT primarykey (pkfield*)>
-<!ATTLIST primarykey name %name; #REQUIRED>
 
-
 <!-- ============================ -->
-<!-- Child elements of definition -->
+<!-- Child elements of primarykey -->
 <!-- ============================ -->
-<!ELEMENT column EMPTY>
-<!ATTLIST column field %name; #REQUIRED>
-<!ATTLIST column type %name; #REQUIRED>
-<!ATTLIST column key %boolean;>
+<!ELEMENT pkfield EMPTY>
+<!ATTLIST pkfield name %name; #REQUIRED>
 
 
 <!-- ====================== -->
@@ -135,9 +135,9 @@
 <!-- ============================= -->
 <!-- Child elements of constraints -->
 <!-- ============================= -->
-<!ELEMENT constraint (constraintfield*, constraintref*)>
-<!ATTLIST constraint name %name; #REQUIRED>
-<!ATTLIST constraint type %name; #IMPLIED>
+<!ELEMENT foreignkey (fkfield*)>
+<!ATTLIST foreignkey name %name; #REQUIRED>
+<!ATTLIST foreignkey references %name; #IMPLIED>
 
 
 <!-- ======================== -->
@@ -146,7 +146,6 @@
 <!ELEMENT field EMPTY>
 <!ATTLIST field name ID #REQUIRED>
 <!ATTLIST field type %name; #REQUIRED>
-<!ATTLIST field auto %boolean;>
 <!ATTLIST field default %text; #IMPLIED>
 <!ATTLIST field defaultwith (constant | serial | timestamp) "constant">
 <!ATTLIST field description %text; #IMPLIED>
@@ -158,7 +157,6 @@
 <!ATTLIST import-field name ID #REQUIRED>
 <!ATTLIST import-field library %name; #REQUIRED>
 <!ATTLIST import-field type %name; #REQUIRED>
-<!ATTLIST import-field auto %boolean;>
 <!ATTLIST import-field default %text; #IMPLIED>
 <!ATTLIST import-field defaultwith (constant | serial | timestamp) "constant">
 <!ATTLIST import-field description %text; #IMPLIED>
@@ -175,33 +173,22 @@
 <!ATTLIST index unique %boolean;>
 
 
-<!-- ============================ -->
-<!-- Child elements of primarykey -->
-<!-- ============================ -->
-<!ELEMENT pkfield EMPTY>
-<!ATTLIST pkfield name %name; #REQUIRED>
-
-
 <!-- ===================== -->
 <!-- Child elements of row -->
 <!-- ===================== -->
 <!ELEMENT value EMPTY>
 <!ATTLIST value field %name; #IMPLIED>
-<!ATTLIST value key %boolean;>
 <!ATTLIST value type %name; "text">
 
 
 <!-- ============================ -->
-<!-- Child elements of constraint -->
+<!-- Child elements of foreignkey -->
 <!-- ============================ -->
-<!ELEMENT constraintfield EMPTY>
-<!ATTLIST constraintfield name %name; #REQUIRED>
+<!ELEMENT fkfield EMPTY>
+<!ATTLIST fkfield name %name; #REQUIRED>
+<!ATTLIST fkfield references %name; #REQUIRED>
 
-<!ELEMENT constraintref EMPTY>
-<!ATTLIST constraintref name %name; #REQUIRED>
-<!ATTLIST constraintref table %name; #REQUIRED>
 
-
 <!-- ======================= -->
 <!-- Child elements of index -->
 <!-- ======================= -->
@@ -210,5 +197,5 @@
 
 
 <!-- This DTD was created by gnuedtd
-     Updated: 2005-03-08 17:43:32   -->
+     Updated: 2005-06-22 13:25:16   -->
 

Modified: trunk/gnue-common/scripts/gnuedtd
===================================================================
--- trunk/gnue-common/scripts/gnuedtd   2005-06-22 09:50:24 UTC (rev 7637)
+++ trunk/gnue-common/scripts/gnuedtd   2005-06-22 11:29:20 UTC (rev 7638)
@@ -63,9 +63,9 @@
       version = VERSION
 
     elif tool == 'schema':
-      from gnue.common.schema import GSParser
+      from gnue.common.datasources import GSchema
       from gnue.common import VERSION, PACKAGE
-      xmlElements = GSParser.getXMLelements()
+      xmlElements = GSchema.getXMLelements()
       topLevelElement = 'schema'
       name = 'GNUe Schema'
       version = VERSION
@@ -128,7 +128,7 @@
 
     dest.write ("""
 <!--
-     Copyright 2001-2004 Free Software Foundation
+     Copyright 2001-2005 Free Software Foundation
 
      This file is part of GNU Enterprise.