Author: gk
Date: Tue Oct 29 09:25:21 2019
New Revision: 1869103
URL: http://svn.apache.org/viewvc?rev=1869103&view=rev
Log:
- fix for error parsing XML source file: cvc-complex-type.3.2.2: Attribute 'enumName' is not allowed to appear in element 'column'.
Torque Templates:
- renamed enumName to enumType, which seemed to be the indented name.
- in database-4-1.xsd schema added enumType to complex Type viewColumType (not exact an extension of columType, else would extend it).
- added missing to control.xml (like the other control.xml elements)
Torque Test
- name change tested with hsqldb
Modified:
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnJavaTransformer.java
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/jdbc2schema/conf/control.xml
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-1.xsd
db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml
db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml
Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java?rev=1869103&r1=1869102&r2=1869103&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java Tue Oct 29 09:25:21 2019
@@ -244,10 +244,10 @@ public enum TemplateOptionName implement
OM_JOIN_GETTER_VISIBILITY("torque.om.complexObjectModel.joinGetterVisibility"),
/** The prefix for the name of enum types. */
- OM_ENUM_NAME_PREFIX("torque.om.enumNamePrefix"),
+ OM_ENUM_TYPE_PREFIX("torque.om.enumTypePrefix"),
/** The suffix for the name of enum types. */
- OM_ENUM_NAME_SUFFIX("torque.om.enumNameSuffix"),
+ OM_ENUM_TYPE_SUFFIX("torque.om.enumTypeSuffix"),
/** The prefix for the constraint name for enum types. */
SQL_ENUM_CONSTRAINT_NAME_PREFIX("torque.sql.enumConstraintNamePrefix"),
Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java?rev=1869103&r1=1869102&r2=1869103&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java Tue Oct 29 09:25:21 2019
@@ -93,7 +93,7 @@ public enum TorqueSchemaAttributeName im
/** attribute version */
VERSION ("version"),
/** attribute version */
- ENUM_NAME("enumName");
+ ENUM_TYPE("enumType");
/** The name of the attribute, not null. */
private String name;
Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnJavaTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnJavaTransformer.java?rev=1869103&r1=1869102&r2=1869103&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnJavaTransformer.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnJavaTransformer.java Tue Oct 29 09:25:21 2019
@@ -470,7 +470,7 @@ public class OMColumnJavaTransformer
/**
* Sets the enumClassName, enumPackage and generateEnum Attributes
- * if either enumValue child elements are present or the enumName
+ * if either enumValue child elements (xml element <code>enum-value</code>) are present or the enumType
* attribute is set on the column.
* Afterwards, the enumClassName attribute contains the unqualified name
* of the enum, the enumPackage attribute contains the enum package,
@@ -489,7 +489,7 @@ public class OMColumnJavaTransformer
final SourceElement columnElement,
final ControllerState controllerState)
{
- String enumClassName = (String) columnElement.getAttribute(TorqueSchemaAttributeName.ENUM_NAME);
+ String enumClassName = (String) columnElement.getAttribute(TorqueSchemaAttributeName.ENUM_TYPE);
// whether to generate an enum class. This is not the same as columnIsEnum because
// we have the case of pre-defined enums (no enum-value attributes given).
boolean generateEnum = columnElement.getChild(TorqueSchemaElementName.ENUM_VALUE) != null;
@@ -517,9 +517,9 @@ public class OMColumnJavaTransformer
{
columnIsEnum = true;
}
- enumClassName = controllerState.getStringOption(TemplateOptionName.OM_ENUM_NAME_PREFIX)
+ enumClassName = controllerState.getStringOption(TemplateOptionName.OM_ENUM_TYPE_PREFIX)
+ columnElement.getAttribute(TorqueSchemaAttributeName.JAVA_NAME)
- + controllerState.getStringOption(TemplateOptionName.OM_ENUM_NAME_SUFFIX);
+ + controllerState.getStringOption(TemplateOptionName.OM_ENUM_TYPE_SUFFIX);
enumPackage = (String) columnElement.getParent().getAttribute(
TableAttributeName.DB_OBJECT_PACKAGE);
}
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/jdbc2schema/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/jdbc2schema/conf/control.xml?rev=1869103&r1=1869102&r2=1869103&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/jdbc2schema/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/jdbc2schema/conf/control.xml Tue Oct 29 09:25:21 2019
@@ -24,6 +24,25 @@
xmlns="http://db.apache.org/torque/4.0/generator/configuration">
<options xsi:type="propertiesOptions" path="options.properties"/>
+
+ <entityReference
+ systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
+ resource="../../xsd/database-4-0.xsd" />
+ <entityReference
+ systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd"
+ resource="../../xsd/database-4-0-strict.xsd" />
+ <entityReference
+ systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0.xsd"
+ resource="../../xsd/database-4-0.xsd" />
+ <entityReference
+ systemId="http://db.apache.org/torque/torque-4.0/documentation/orm-reference/database-4-0-strict.xsd"
+ resource="../../xsd/database-4-0-strict.xsd" />
+ <entityReference
+ systemId="http://db.apache.org/torque/torque-4.1/documentation/orm-reference/database-4-1.xsd"
+ resource="../../xsd/database-4-1.xsd" />
+ <entityReference
+ systemId="http://db.apache.org/torque/torque-4.1/documentation/orm-reference/database-4-1-strict.xsd"
+ resource="../../xsd/database-4-1-strict.xsd" />
<output name="jdbc2schema">
<filenameOutlet
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties?rev=1869103&r1=1869102&r2=1869103&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/options.properties Tue Oct 29 09:25:21 2019
@@ -290,9 +290,9 @@ torque.om.package.mapInitPackageSuffix =
torque.om.column.defaultType = VARCHAR
# The prefix for the name of enum types.
-torque.om.enumNamePrefix =
+torque.om.enumTypePrefix =
# The suffix for the name of enum types.
-torque.om.enumNameSuffix = Enum
+torque.om.enumTypeSuffix = Enum
# Whether to generate the deprecated retrieveByPKs methods,
# which have been renamed to retrieveByObjectKeys.
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-1.xsd
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-1.xsd?rev=1869103&r1=1869102&r2=1869103&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-1.xsd (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-1.xsd Tue Oct 29 09:25:21 2019
@@ -562,7 +562,7 @@ fully qualified or unqualified.
<xs:attribute name="description" type="xs:string" use="optional" >
<xs:annotation>
<xs:documentation xml:lang="en">
-The description of this domain for documentation purposes.
+The description of this column for documentation purposes.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -1024,6 +1024,15 @@ The description of this column for docum
</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="enumType" use="optional" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+If this attribute has a value, the java type for the column is an enum.
+The name of the enum type is contained in this attribute. It can be either
+fully qualified or unqualified.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:complexType>
<!-- =====================================
Type definitions for attributes
Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml?rev=1869103&r1=1869102&r2=1869103&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml Tue Oct 29 09:25:21 2019
@@ -23,7 +23,7 @@
xsi:schemaLocation="http://db.apache.org/torque/4.1/templates/database
http://db.apache.org/torque/torque-4.1/documentation/orm-reference/database-4-1.xsd"
name="bookstore"
- defaultIdMethod="native">
+ defaultIdMethod="native" >
<external-schema filename="ext-schema.xml" />
<!-- =================================================== -->
@@ -404,7 +404,7 @@
<column name="a_name" type="VARCHAR" select="a.name"/>
<column name="b_id" type="INTEGER" select="b.b_id"/>
<column name="b_name" type="VARCHAR" select="b.name"/>
- <column name="enum" type="VARCHAR" enumName="a.b.SomeEnum" select="a.enum"/>
+ <column name="enum" type="VARCHAR" enumType="a.b.SomeEnum" select="a.enum"/>
</view>
</database>
Modified: db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml?rev=1869103&r1=1869102&r2=1869103&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml (original)
+++ db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml Tue Oct 29 09:25:21 2019
@@ -165,12 +165,12 @@
<enum-value value="y"/>
<enum-value value="z" javaName="ZZZ"/>
</column>
- <column name="int_column" type="INTEGER" default="1" enumName="MyIntColumnEnum" javaType="object">
+ <column name="int_column" type="INTEGER" default="1" enumType="MyIntColumnEnum" javaType="object">
<enum-value value="1"/>
<enum-value value="2" javaName="TWO"/>
<enum-value value="3"/>
</column>
- <column name="predefined_enum_column" type="VARCHAR" size="50" enumName="org.apache.torque.TestEnum" />
+ <column name="predefined_enum_column" type="VARCHAR" size="50" enumType="org.apache.torque.TestEnum" />
<column name="int_primitive_column" type="INTEGER" default="1" javaType="primitive">
<enum-value value="1"/>
<enum-value value="2"/>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.