[Pymerase-cvs-commit] pymerase/examples/school/schema Classes.xml,1.6,1.7 Courses.xml,1.2,1.3 People.xml,1.2,1.3 Students.xml,1.5,1.6

[<de...@us...>]

Update of /cvsroot/pymerase/pymerase/examples/school/schema
In directory sc8-pr-cvs1:/tmp/cvs-serv5492

Modified Files:
	Classes.xml Courses.xml People.xml Students.xml 
Log Message:
small changes to Table.dtd xml schema to make it match up better with what's generated from the UML/XMI model

Index: Classes.xml
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/school/schema/Classes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Classes.xml	5 Apr 2003 00:56:49 -0000	1.6
--- Classes.xml	25 Apr 2003 23:48:12 -0000	1.7
***************
*** 8,27 ****
        type="serial"
        comment=""/>
!   <column name="uid_fk"
!           full_name="uid_fk"
            type="int4"
            not_null="true"
            comment=""/>
!   <foreign_key column_id="uid_fk"
          foreign_table      ="People"
!         foreign_table_pkey ="Uid"
          fkey_type          ="&fkey_oto;"
          foreign_association_name="Students"/>
!   <column name="course_fk"
!           full_name="course_fk"
            type="int4"
            not_null="true"
            comment=""/>
!   <foreign_key column_id="course_fk"
          foreign_table      ="Courses"
          foreign_table_pkey ="course_pk"
--- 8,27 ----
        type="serial"
        comment=""/>
!   <column name="students_fk"
!           full_name="students_fk"
            type="int4"
            not_null="true"
            comment=""/>
!   <foreign_key column_id="students_fk"
          foreign_table      ="People"
!         foreign_table_pkey ="people_pk"
          fkey_type          ="&fkey_oto;"
          foreign_association_name="Students"/>
!   <column name="courses_fk"
!           full_name="courses_fk"
            type="int4"
            not_null="true"
            comment=""/>
!   <foreign_key column_id="courses_fk"
          foreign_table      ="Courses"
          foreign_table_pkey ="course_pk"

Index: Courses.xml
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/school/schema/Courses.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Courses.xml	5 Apr 2003 00:56:49 -0000	1.2
--- Courses.xml	25 Apr 2003 23:48:12 -0000	1.3
***************
*** 7,11 ****
        type="serial"
        comment=""/>
!   <column name="code"
            full_name="Course Code"
            type="varchar(64)"
--- 7,11 ----
        type="serial"
        comment=""/>
!   <column name="course_code"
            full_name="Course Code"
            type="varchar(64)"

Index: People.xml
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/school/schema/People.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** People.xml	5 Apr 2003 00:56:49 -0000	1.2
--- People.xml	25 Apr 2003 23:48:12 -0000	1.3
***************
*** 3,9 ****
  <table name="People"
        comment="Base class describing a person"> 
    <column name="Uid"
        full_name="Universal ID"
!       type="serial"
        comment=""/>
    <column name="GivenName"
--- 3,13 ----
  <table name="People"
        comment="Base class describing a person"> 
+   <column name="PeoplePk"
+           full_name="People Primary Key"
+           type="serial"
+           comments=""/>
    <column name="Uid"
        full_name="Universal ID"
!       type="varchar(8)"
        comment=""/>
    <column name="GivenName"
***************
*** 15,18 ****
            type="varchar(64)"
            comment=""/>
!   <primary_key column_id="Uid"/>
  </table>
--- 19,22 ----
            type="varchar(64)"
            comment=""/>
!   <primary_key column_id="PeoplePk"/>
  </table>

Index: Students.xml
===================================================================
RCS file: /cvsroot/pymerase/pymerase/examples/school/schema/Students.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Students.xml	5 Apr 2003 00:56:49 -0000	1.5
--- Students.xml	25 Apr 2003 23:48:12 -0000	1.6
***************
*** 4,23 ****
        comment=""
        inherits_from="People"> 
!   <column name="house_fk"
            full_name="House"
            type="int4"
            comment=""/>
!   <foreign_key column_id="house_fk"
          foreign_table      ="Houses"
          foreign_table_pkey ="house_pk"
!         fkey_type          ="&fkey_oto;"/>
!   <column name="advisor_fk"
            full_name="Advisor key"
            type="int4"
            comment=""/>
    <!-- FIXME: the orientation code may be wrong -->
!   <foreign_key column_id="advisor_fk"
                 foreign_table="Faculty"
!                foreign_table_pkey="uid"
                 fkey_type="&fkey_oto;"
                 foreign_association_name="Advisor"
--- 4,25 ----
        comment=""
        inherits_from="People"> 
!   <column name="houses_fk"
            full_name="House"
            type="int4"
            comment=""/>
!   <foreign_key column_id="houses_fk"
          foreign_table      ="Houses"
          foreign_table_pkey ="house_pk"
!         fkey_type          ="&fkey_oto;"
!         foreign_association_name="House"
!         local_association_name="Students"/>
!   <column name="faculty_fk"
            full_name="Advisor key"
            type="int4"
            comment=""/>
    <!-- FIXME: the orientation code may be wrong -->
!   <foreign_key column_id="faculty_fk"
                 foreign_table="Faculty"
!                foreign_table_pkey="people_pk"
                 fkey_type="&fkey_oto;"
                 foreign_association_name="Advisor"