svn commit: r995646 - /db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd

[tf...@apache.org]

Author: tfischer
Date: Fri Sep 10 02:52:18 2010
New Revision: 995646

URL: http://svn.apache.org/viewvc?rev=995646&view=rev
Log:
- TORQUE-127: remove "null" value of idMethod attribute of element table.
- Also removed null value of defaultIdMethod attribute which was introduced in the dtd to xsd translation.
- renamed idBrokerType to idMethodType to avoid overloading of term idBroker (this term refers to Torque's db-independent method already and should not be used as general term in my opinion).

Modified:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd?rev=995646&r1=995645&r2=995646&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd Fri Sep 10 02:52:18 2010
@@ -177,7 +177,7 @@ to primitive.
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="defaultIdMethod" use="optional" type="idBrokerType"
+    <xs:attribute name="defaultIdMethod" use="optional" type="idMethodType"
                   default="none" >
       <xs:annotation>
         <xs:documentation xml:lang="en">
@@ -382,8 +382,7 @@ i.e. it needs to be the superclass.
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="idMethod" use="optional" type="idBrokerType"
-                  default="null" >
+    <xs:attribute name="idMethod" use="optional" type="idMethodType">
       <xs:annotation>
         <xs:documentation xml:lang="en">
 Defines the defaultIdMethod to use with tables which do not have an idMethod
@@ -883,23 +882,21 @@ Standard SQL column data types.
     </xs:restriction>
   </xs:simpleType>
   
-  <xs:simpleType name="idBrokerType">
+  <xs:simpleType name="idMethodType">
     <xs:annotation>
       <xs:documentation xml:lang="en">
-A schema type for idBroker methods.  An idBroker defines the way that
-record id values will be automatically created.
+A schema type for methods to create ids automatically.
 
 idbroker = Torque's software based id broker system
-native   = The SQL Server's native autoincrement/identifier process
+native   = The SQL Server's native method, depends on database used
+           (e.g. autoincrement for MySQL, sequence for postgresql...)
 none     = Don't try to auto assign id numbers
-null     = Use the value previously set or the default value.
       </xs:documentation>
     </xs:annotation>
     <xs:restriction base="xs:NMTOKEN">
       <xs:enumeration value="idbroker" />
       <xs:enumeration value="native" />
       <xs:enumeration value="none" />
-      <xs:enumeration value="null" />
     </xs:restriction>
   </xs:simpleType>
   



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org