[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/utils/xml2sql/pgsql.xsl forms/sampl...
|
From: |
Jan Ischebeck |
|
Subject: |
gnue common/utils/xml2sql/pgsql.xsl forms/sampl... |
|
Date: |
Wed, 24 Jul 2002 19:25:25 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jan Ischebeck <address@hidden> 02/07/24 19:25:25
Modified files:
common/utils/xml2sql: pgsql.xsl
forms/samples/track/sql: dbschema.gsd
designer/src/forms/wizards: CreateSchema.py
designer/src/schema/parser: gnue-schema.dtd
Added files:
common/utils/xml2sql: pgsql_2.xsl
Log message:
CreateSchema.py: change default field type to varchar
added new pgsql stylesheet which move primary key definition into table
def.
other small updates
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/utils/xml2sql/pgsql_2.xsl?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/utils/xml2sql/pgsql.xsl.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/samples/track/sql/dbschema.gsd.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/CreateSchema.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/parser/gnue-schema.dtd.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gnue/common/utils/xml2sql/pgsql.xsl
diff -c gnue/common/utils/xml2sql/pgsql.xsl:1.4
gnue/common/utils/xml2sql/pgsql.xsl:1.5
*** gnue/common/utils/xml2sql/pgsql.xsl:1.4 Tue Jul 23 16:56:37 2002
--- gnue/common/utils/xml2sql/pgsql.xsl Wed Jul 24 19:25:25 2002
***************
*** 77,83 ****
<xsl:value-of select="$table"/><xsl:text>(</xsl:text>
<xsl:for-each select="idxfield">
<xsl:if test="position() > 1"><xsl:text>, </xsl:text></xsl:if>
! <xsl:value-of select="."/>
</xsl:for-each>
<xsl:text>);</xsl:text></command>
</xsl:for-each>
--- 77,83 ----
<xsl:value-of select="$table"/><xsl:text>(</xsl:text>
<xsl:for-each select="idxfield">
<xsl:if test="position() > 1"><xsl:text>, </xsl:text></xsl:if>
! <xsl:value-of select="@name"/>
</xsl:for-each>
<xsl:text>);</xsl:text></command>
</xsl:for-each>
***************
*** 96,110 ****
<xsl:value-of select="$table"/><xsl:text>(</xsl:text>
<xsl:for-each select="constraintfield">
<xsl:if test="position() > 1"><xsl:text>, </xsl:text></xsl:if>
! <xsl:value-of select="."/>
</xsl:for-each>
<xsl:text>);</xsl:text>
</xsl:when>
<xsl:when test="@type = "foreignkey"">
<xsl:text>Alter Table </xsl:text><xsl:value-of
select="$table"/><xsl:text> Add Constraint </xsl:text>
<xsl:value-of select="@name"/><xsl:text> foreign key (</xsl:text>
! <xsl:value-of select="ref/@sourceField"/><xsl:text>) references
</xsl:text>
! <xsl:value-of
select="ref/@destinationTable"/><xsl:text>(</xsl:text><xsl:value-of
select="ref/@destinationField"/>
<xsl:text>);</xsl:text>
</xsl:when>
</xsl:choose>
--- 96,110 ----
<xsl:value-of select="$table"/><xsl:text>(</xsl:text>
<xsl:for-each select="constraintfield">
<xsl:if test="position() > 1"><xsl:text>, </xsl:text></xsl:if>
! <xsl:value-of select="@name"/>
</xsl:for-each>
<xsl:text>);</xsl:text>
</xsl:when>
<xsl:when test="@type = "foreignkey"">
<xsl:text>Alter Table </xsl:text><xsl:value-of
select="$table"/><xsl:text> Add Constraint </xsl:text>
<xsl:value-of select="@name"/><xsl:text> foreign key (</xsl:text>
! <xsl:value-of select="constraintfield/@name"/><xsl:text>)
references </xsl:text>
! <xsl:value-of
select="constraintref/@table"/><xsl:text>(</xsl:text><xsl:value-of
select="constraintref/@name"/>
<xsl:text>);</xsl:text>
</xsl:when>
</xsl:choose>
Index: gnue/designer/src/forms/wizards/CreateSchema.py
diff -c gnue/designer/src/forms/wizards/CreateSchema.py:1.5
gnue/designer/src/forms/wizards/CreateSchema.py:1.6
*** gnue/designer/src/forms/wizards/CreateSchema.py:1.5 Wed Jul 24 18:44:53 2002
--- gnue/designer/src/forms/wizards/CreateSchema.py Wed Jul 24 19:25:25 2002
***************
*** 170,176 ****
table=self.tablelist[string.lower(myblock.datasource)]
! self.AddField(table, obj.field, 'string')
#
# add fields to the table referenced in dropdowns
--- 170,176 ----
table=self.tablelist[string.lower(myblock.datasource)]
! self.AddField(table, obj.field, 'varchar')
#
# add fields to the table referenced in dropdowns
***************
*** 181,192 ****
table=self.tablelist[string.lower(obj.fk_source)]
# add 'fk_key' field
! self.AddField(table, obj.fk_key, 'string')
if hasattr(obj,'fk_description'):
# add 'fk_description' field
! self.AddField(table, obj.fk_description, 'string')
elif obj._type=='GFDataSource':
--- 181,192 ----
table=self.tablelist[string.lower(obj.fk_source)]
# add 'fk_key' field
! self.AddField(table, obj.fk_key, 'varchar')
if hasattr(obj,'fk_description'):
# add 'fk_description' field
! self.AddField(table, obj.fk_description, 'varchar')
elif obj._type=='GFDataSource':
***************
*** 213,219 ****
nfk_ref.name=obj.masterlink
# create a field for that key
! self.AddField(table, obj.detaillink, 'string')
if self.tablelist[string.lower(obj.master)]:
--- 213,219 ----
nfk_ref.name=obj.masterlink
# create a field for that key
! self.AddField(table, obj.detaillink, 'varchar')
if self.tablelist[string.lower(obj.master)]:
***************
*** 227,233 ****
pkeyf.name=obj.masterlink
# add field
! self.AddField(mtable, obj.masterlink, 'string')
elif oldpkey.name!=obj.masterlink:
print "WARNING: different primary keys computed out of "+\
--- 227,233 ----
pkeyf.name=obj.masterlink
# add field
! self.AddField(mtable, obj.masterlink, 'varchar')
elif oldpkey.name!=obj.masterlink:
print "WARNING: different primary keys computed out of "+\
Index: gnue/designer/src/schema/parser/gnue-schema.dtd
diff -c gnue/designer/src/schema/parser/gnue-schema.dtd:1.4
gnue/designer/src/schema/parser/gnue-schema.dtd:1.5
*** gnue/designer/src/schema/parser/gnue-schema.dtd:1.4 Mon Jul 15 16:12:50 2002
--- gnue/designer/src/schema/parser/gnue-schema.dtd Wed Jul 24 19:25:25 2002
***************
*** 73,79 ****
<!-- ======================== -->
<!-- Child elements of tables -->
<!-- ======================== -->
! <!ELEMENT table (constraints?, fields?, primarykey?)>
<!ATTLIST table name ID #REQUIRED>
<!ATTLIST table description %text; #IMPLIED>
--- 73,79 ----
<!-- ======================== -->
<!-- Child elements of tables -->
<!-- ======================== -->
! <!ELEMENT table (constraints?, fields?, indexes?, primarykey?)>
<!ATTLIST table name ID #REQUIRED>
<!ATTLIST table description %text; #IMPLIED>
***************
*** 91,96 ****
--- 91,98 ----
<!ELEMENT fields (field*)>
+ <!ELEMENT indexes (index*)>
+
<!ELEMENT primarykey (pkfield*)>
<!ATTLIST primarykey name %name; #REQUIRED>
***************
*** 104,110 ****
<!-- ============================= -->
<!-- Child elements of constraints -->
<!-- ============================= -->
! <!ELEMENT constraint (constraintfield*)>
<!ATTLIST constraint name %name; #REQUIRED>
<!ATTLIST constraint type %name; #IMPLIED>
--- 106,112 ----
<!-- ============================= -->
<!-- Child elements of constraints -->
<!-- ============================= -->
! <!ELEMENT constraint (constraintfield*, constraintref*)>
<!ATTLIST constraint name %name; #REQUIRED>
<!ATTLIST constraint type %name; #IMPLIED>
***************
*** 121,126 ****
--- 123,136 ----
<!ATTLIST field size %whole; #IMPLIED>
+ <!-- ========================= -->
+ <!-- Child elements of indexes -->
+ <!-- ========================= -->
+ <!ELEMENT index (indexfield*)>
+ <!ATTLIST index name %name; #REQUIRED>
+ <!ATTLIST index unique %boolean;>
+
+
<!-- ============================ -->
<!-- Child elements of primarykey -->
<!-- ============================ -->
***************
*** 133,139 ****
<!-- ===================== -->
<!ELEMENT value EMPTY>
<!ATTLIST value field %name; #REQUIRED>
! <!ATTLIST value type %name; #DEFAULT "text">
<!-- ============================ -->
--- 143,149 ----
<!-- ===================== -->
<!ELEMENT value EMPTY>
<!ATTLIST value field %name; #REQUIRED>
! <!ATTLIST value type %name; "text">
<!-- ============================ -->
***************
*** 142,148 ****
<!ELEMENT constraintfield EMPTY>
<!ATTLIST constraintfield name %name; #REQUIRED>
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 15:12:27 -->
--- 152,169 ----
<!ELEMENT constraintfield EMPTY>
<!ATTLIST constraintfield name %name; #REQUIRED>
+ <!ELEMENT constraintref EMPTY>
+ <!ATTLIST constraintref name %name; #REQUIRED>
+ <!ATTLIST constraintref table %name; #REQUIRED>
+
+
+ <!-- ======================= -->
+ <!-- Child elements of index -->
+ <!-- ======================= -->
+ <!ELEMENT indexfield EMPTY>
+ <!ATTLIST indexfield name %name; #REQUIRED>
+
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-25 01:08:58 -->
Index: gnue/forms/samples/track/sql/dbschema.gsd
diff -c gnue/forms/samples/track/sql/dbschema.gsd:1.2
gnue/forms/samples/track/sql/dbschema.gsd:1.3
*** gnue/forms/samples/track/sql/dbschema.gsd:1.2 Wed Jul 24 18:44:53 2002
--- gnue/forms/samples/track/sql/dbschema.gsd Wed Jul 24 19:25:25 2002
***************
*** 5,16 ****
<tables>
<table name="person">
<fields>
! <field name="id" type="string"/>
! <field name="first_name" type="string"/>
! <field name="last_name" type="string"/>
! <field name="irc_handle" type="string"/>
! <field name="url" type="string"/>
! <field name="assignment_status" type="string"/>
</fields>
<constraints/>
<primarykey>
--- 5,16 ----
<tables>
<table name="person">
<fields>
! <field name="id" type="varchar"/>
! <field name="first_name" type="varchar"/>
! <field name="last_name" type="varchar"/>
! <field name="irc_handle" type="varchar"/>
! <field name="url" type="varchar"/>
! <field name="assignment_status" type="varchar"/>
</fields>
<constraints/>
<primarykey>
***************
*** 19,32 ****
</table>
<table name="address">
<fields>
! <field name="personid" type="string"/>
! <field name="address_type" type="string"/>
! <field name="addr1" type="string"/>
! <field name="addr2" type="string"/>
! <field name="city" type="string"/>
! <field name="state" type="string"/>
! <field name="zip" type="string"/>
! <field name="country" type="string"/>
</fields>
<constraints>
<constraint name="fk_address_personid" type="foreignkey">
--- 19,32 ----
</table>
<table name="address">
<fields>
! <field name="personid" type="varchar"/>
! <field name="address_type" type="varchar"/>
! <field name="addr1" type="varchar"/>
! <field name="addr2" type="varchar"/>
! <field name="city" type="varchar"/>
! <field name="state" type="varchar"/>
! <field name="zip" type="varchar"/>
! <field name="country" type="varchar"/>
</fields>
<constraints>
<constraint name="fk_address_personid" type="foreignkey">
***************
*** 38,49 ****
</table>
<table name="phone">
<fields>
! <field name="personid" type="string"/>
! <field name="phone_type" type="string"/>
! <field name="areacode" type="string"/>
! <field name="prefix" type="string"/>
! <field name="suffix" type="string"/>
! <field name="extension" type="string"/>
</fields>
<constraints>
<constraint name="fk_phone_personid" type="foreignkey">
--- 38,49 ----
</table>
<table name="phone">
<fields>
! <field name="personid" type="varchar"/>
! <field name="phone_type" type="varchar"/>
! <field name="areacode" type="varchar"/>
! <field name="prefix" type="varchar"/>
! <field name="suffix" type="varchar"/>
! <field name="extension" type="varchar"/>
</fields>
<constraints>
<constraint name="fk_phone_personid" type="foreignkey">
***************
*** 55,63 ****
</table>
<table name="email">
<fields>
! <field name="personid" type="string"/>
! <field name="email_type" type="string"/>
! <field name="email" type="string"/>
</fields>
<constraints>
<constraint name="fk_email_personid" type="foreignkey">
--- 55,63 ----
</table>
<table name="email">
<fields>
! <field name="personid" type="varchar"/>
! <field name="email_type" type="varchar"/>
! <field name="email" type="varchar"/>
</fields>
<constraints>
<constraint name="fk_email_personid" type="foreignkey">
***************
*** 69,113 ****
</table>
<table name="address_type">
<fields>
! <field name="id" type="string"/>
! <field name="description" type="string"/>
</fields>
<constraints/>
<primarykey/>
</table>
<table name="phone_type">
<fields>
! <field name="id" type="string"/>
! <field name="description" type="string"/>
</fields>
<constraints/>
<primarykey/>
</table>
<table name="email_type">
<fields>
! <field name="id" type="string"/>
! <field name="description" type="string"/>
</fields>
<constraints/>
<primarykey/>
</table>
<table name="assignment_status">
<fields>
! <field name="id" type="string"/>
! <field name="status" type="string"/>
</fields>
<constraints/>
<primarykey/>
</table>
<table name="history">
<fields>
! <field name="person" type="string"/>
! <field name="subject" type="string"/>
! <field name="contact_date" type="string"/>
! <field name="notes" type="string"/>
! <field name="contact_type" type="string"/>
! <field name="location" type="string"/>
! <field name="duration" type="string"/>
</fields>
<constraints>
<constraint name="fk_history_person" type="foreignkey">
--- 69,113 ----
</table>
<table name="address_type">
<fields>
! <field name="id" type="varchar"/>
! <field name="description" type="varchar"/>
</fields>
<constraints/>
<primarykey/>
</table>
<table name="phone_type">
<fields>
! <field name="id" type="varchar"/>
! <field name="description" type="varchar"/>
</fields>
<constraints/>
<primarykey/>
</table>
<table name="email_type">
<fields>
! <field name="id" type="varchar"/>
! <field name="description" type="varchar"/>
</fields>
<constraints/>
<primarykey/>
</table>
<table name="assignment_status">
<fields>
! <field name="id" type="varchar"/>
! <field name="status" type="varchar"/>
</fields>
<constraints/>
<primarykey/>
</table>
<table name="history">
<fields>
! <field name="person" type="varchar"/>
! <field name="subject" type="varchar"/>
! <field name="contact_date" type="varchar"/>
! <field name="notes" type="varchar"/>
! <field name="contact_type" type="varchar"/>
! <field name="location" type="varchar"/>
! <field name="duration" type="varchar"/>
</fields>
<constraints>
<constraint name="fk_history_person" type="foreignkey">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue common/utils/xml2sql/pgsql.xsl forms/sampl...,
Jan Ischebeck <=