Repository: cayenne Updated Branches: refs/heads/master 2c9896cae -> d608777a9
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/relationships-to-one-fk.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/relationships-to-one-fk.map.xml b/cayenne-server/src/test/resources/relationships-to-one-fk.map.xml index fbb7bec..cb7c147 100644 --- a/cayenne-server/src/test/resources/relationships-to-one-fk.map.xml +++ b/cayenne-server/src/test/resources/relationships-to-one-fk.map.xml @@ -1,26 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_to_one_fk"/> - <db-entity name="TO_ONE_FK1"> - <db-attribute name="TO_ONE_FK1_FK" type="INTEGER" isMandatory="true"/> - <db-attribute name="TO_ONE_FK1_PK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="TO_ONE_FK2"> - <db-attribute name="TO_ONE_FK2_PK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <obj-entity name="ToOneFK1" className="org.apache.cayenne.testdo.relationships_to_one_fk.ToOneFK1" dbEntityName="TO_ONE_FK1"> - </obj-entity> - <obj-entity name="ToOneFK2" className="org.apache.cayenne.testdo.relationships_to_one_fk.ToOneFK2" dbEntityName="TO_ONE_FK2"> - </obj-entity> - <db-relationship name="toPK" source="TO_ONE_FK1" target="TO_ONE_FK2" toMany="false"> - <db-attribute-pair source="TO_ONE_FK1_FK" target="TO_ONE_FK2_PK"/> - </db-relationship> - <db-relationship name="toOneToFK" source="TO_ONE_FK2" target="TO_ONE_FK1" toMany="false"> - <db-attribute-pair source="TO_ONE_FK2_PK" target="TO_ONE_FK1_FK"/> - </db-relationship> - <obj-relationship name="toPK" source="ToOneFK1" target="ToOneFK2" db-relationship-path="toPK"/> - <obj-relationship name="toOneToFK" source="ToOneFK2" target="ToOneFK1" db-relationship-path="toOneToFK"/> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_to_one_fk"/> + <db-entity name="TO_ONE_FK1"> + <db-attribute name="TO_ONE_FK1_FK" type="INTEGER" isMandatory="true"/> + <db-attribute name="TO_ONE_FK1_PK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="TO_ONE_FK2"> + <db-attribute name="TO_ONE_FK2_PK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <obj-entity name="ToOneFK1" className="org.apache.cayenne.testdo.relationships_to_one_fk.ToOneFK1" dbEntityName="TO_ONE_FK1"/> + <obj-entity name="ToOneFK2" className="org.apache.cayenne.testdo.relationships_to_one_fk.ToOneFK2" dbEntityName="TO_ONE_FK2"/> + <db-relationship name="toPK" source="TO_ONE_FK1" target="TO_ONE_FK2"> + <db-attribute-pair source="TO_ONE_FK1_FK" target="TO_ONE_FK2_PK"/> + </db-relationship> + <db-relationship name="toOneToFK" source="TO_ONE_FK2" target="TO_ONE_FK1"> + <db-attribute-pair source="TO_ONE_FK2_PK" target="TO_ONE_FK1_FK"/> + </db-relationship> + <obj-relationship name="toPK" source="ToOneFK1" target="ToOneFK2" db-relationship-path="toPK"/> + <obj-relationship name="toOneToFK" source="ToOneFK2" target="ToOneFK1" db-relationship-path="toOneToFK"/> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/relationships.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/relationships.map.xml b/cayenne-server/src/test/resources/relationships.map.xml index 305b42b..55b9fda 100644 --- a/cayenne-server/src/test/resources/relationships.map.xml +++ b/cayenne-server/src/test/resources/relationships.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.relationships"/> <db-entity name="FK_OF_DIFFERENT_TYPE"> <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> @@ -22,8 +22,7 @@ <db-attribute name="NAME" type="VARCHAR" length="100"/> <db-attribute name="RELATIONSHIP_HELPER_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> </db-entity> - <obj-entity name="FkOfDifferentType" className="org.apache.cayenne.testdo.relationships.FkOfDifferentType" dbEntityName="FK_OF_DIFFERENT_TYPE"> - </obj-entity> + <obj-entity name="FkOfDifferentType" className="org.apache.cayenne.testdo.relationships.FkOfDifferentType" dbEntityName="FK_OF_DIFFERENT_TYPE"/> <obj-entity name="MeaningfulFK" className="org.apache.cayenne.testdo.relationships.MeaningfulFK" dbEntityName="MEANINGFUL_FK"> <obj-attribute name="relationshipHelperID" type="java.lang.Integer" db-attribute-path="RELATIONSHIP_HELPER_ID"/> </obj-entity> @@ -33,19 +32,19 @@ <obj-entity name="RelationshipHelper" className="org.apache.cayenne.testdo.relationships.RelationshipHelper" dbEntityName="RELATIONSHIP_HELPER"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <db-relationship name="relationshipHelper" source="FK_OF_DIFFERENT_TYPE" target="RELATIONSHIP_HELPER" toMany="false"> + <db-relationship name="relationshipHelper" source="FK_OF_DIFFERENT_TYPE" target="RELATIONSHIP_HELPER"> <db-attribute-pair source="RELATIONSHIP_HELPER_FK" target="RELATIONSHIP_HELPER_ID"/> </db-relationship> - <db-relationship name="toRelationshipHelper" source="MEANINGFUL_FK" target="RELATIONSHIP_HELPER" toMany="false"> + <db-relationship name="toRelationshipHelper" source="MEANINGFUL_FK" target="RELATIONSHIP_HELPER"> <db-attribute-pair source="RELATIONSHIP_HELPER_ID" target="RELATIONSHIP_HELPER_ID"/> </db-relationship> <db-relationship name="children" source="REFLEXIVE_AND_TO_ONE" target="REFLEXIVE_AND_TO_ONE" toMany="true"> <db-attribute-pair source="REFLEXIVE_AND_TO_ONE_ID" target="PARENT_ID"/> </db-relationship> - <db-relationship name="toHelper" source="REFLEXIVE_AND_TO_ONE" target="RELATIONSHIP_HELPER" toMany="false"> + <db-relationship name="toHelper" source="REFLEXIVE_AND_TO_ONE" target="RELATIONSHIP_HELPER"> <db-attribute-pair source="RELATIONSHIP_HELPER_ID" target="RELATIONSHIP_HELPER_ID"/> </db-relationship> - <db-relationship name="toParent" source="REFLEXIVE_AND_TO_ONE" target="REFLEXIVE_AND_TO_ONE" toMany="false"> + <db-relationship name="toParent" source="REFLEXIVE_AND_TO_ONE" target="REFLEXIVE_AND_TO_ONE"> <db-attribute-pair source="PARENT_ID" target="REFLEXIVE_AND_TO_ONE_ID"/> </db-relationship> <db-relationship name="fksOfDifferentType" source="RELATIONSHIP_HELPER" target="FK_OF_DIFFERENT_TYPE" toMany="true"> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/return-types.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/return-types.map.xml b/cayenne-server/src/test/resources/return-types.map.xml index 61e9eb1..b0ba1a3 100644 --- a/cayenne-server/src/test/resources/return-types.map.xml +++ b/cayenne-server/src/test/resources/return-types.map.xml @@ -1,92 +1,92 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.return_types"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="TYPES_MAPPING_LOBS_TEST1"> - <db-attribute name="AAAID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="CLOB_COLUMN" type="CLOB"/> - <db-attribute name="NCLOB_COLUMN" type="NCLOB"/> - </db-entity> - <db-entity name="TYPES_MAPPING_TEST1"> - <db-attribute name="AAAID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="BIGINT_COLUMN" type="BIGINT"/> - <db-attribute name="BIT_COLUMN" type="BIT"/> - <db-attribute name="BOOLEAN_COLUMN" type="BOOLEAN"/> - <db-attribute name="CHAR_COLUMN" type="CHAR" length="254"/> - <db-attribute name="NCHAR_COLUMN" type="NCHAR" length="254"/> - <db-attribute name="DATE_COLUMN" type="DATE"/> - <db-attribute name="DECIMAL_COLUMN" type="DECIMAL" length="12" scale="5"/> - <db-attribute name="DOUBLE_COLUMN" type="DOUBLE" scale="7"/> - <db-attribute name="FLOAT_COLUMN" type="FLOAT" scale="3"/> - <db-attribute name="INTEGER_COLUMN" type="INTEGER"/> - <db-attribute name="LONGVARCHAR_COLUMN" type="LONGVARCHAR"/> - <db-attribute name="LONGNVARCHAR_COLUMN" type="LONGNVARCHAR"/> - <db-attribute name="NUMERIC_COLUMN" type="NUMERIC" length="12" scale="5"/> - <db-attribute name="REAL_COLUMN" type="REAL" scale="5"/> - <db-attribute name="SMALLINT_COLUMN" type="SMALLINT"/> - <db-attribute name="TIMESTAMP_COLUMN" type="TIMESTAMP"/> - <db-attribute name="TIME_COLUMN" type="TIME"/> - <db-attribute name="TINYINT_COLUMN" type="TINYINT"/> - <db-attribute name="VARCHAR_COLUMN" type="VARCHAR" length="255"/> - <db-attribute name="NVARCHAR_COLUMN" type="NVARCHAR" length="255"/> - </db-entity> - <db-entity name="TYPES_MAPPING_TEST2"> - <db-attribute name="AAAID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="BINARY_COLUMN" type="BINARY" length="14"/> - <db-attribute name="BLOB_COLUMN" type="BLOB"/> - <db-attribute name="LONGVARBINARY_COLUMN" type="LONGVARBINARY"/> - <db-attribute name="VARBINARY_COLUMN" type="VARBINARY" length="1000"/> - </db-entity> - <obj-entity name="ReturnTypesMap1" className="org.apache.cayenne.testdo.return_types.ReturnTypesMap1" clientClassName="test.client.ReturnTypesMap1" dbEntityName="TYPES_MAPPING_TEST1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> - <obj-attribute name="bigintColumn" type="java.lang.Long" db-attribute-path="BIGINT_COLUMN"/> - <obj-attribute name="bitColumn" type="java.lang.Boolean" db-attribute-path="BIT_COLUMN"/> - <obj-attribute name="booleanColumn" type="java.lang.Boolean" db-attribute-path="BOOLEAN_COLUMN"/> - <obj-attribute name="charColumn" type="java.lang.String" db-attribute-path="CHAR_COLUMN"/> - <obj-attribute name="ncharColumn" type="java.lang.String" db-attribute-path="NCHAR_COLUMN"/> - <obj-attribute name="dateColumn" type="java.util.Date" db-attribute-path="DATE_COLUMN"/> - <obj-attribute name="decimalColumn" type="java.math.BigDecimal" db-attribute-path="DECIMAL_COLUMN"/> - <obj-attribute name="doubleColumn" type="java.lang.Double" db-attribute-path="DOUBLE_COLUMN"/> - <obj-attribute name="floatColumn" type="java.lang.Float" db-attribute-path="FLOAT_COLUMN"/> - <obj-attribute name="integerColumn" type="java.lang.Integer" db-attribute-path="INTEGER_COLUMN"/> - <obj-attribute name="longvarcharColumn" type="java.lang.String" db-attribute-path="LONGVARCHAR_COLUMN"/> - <obj-attribute name="longnvarcharColumn" type="java.lang.String" db-attribute-path="LONGNVARCHAR_COLUMN"/> - <obj-attribute name="numericColumn" type="java.math.BigDecimal" db-attribute-path="NUMERIC_COLUMN"/> - <obj-attribute name="realColumn" type="java.lang.Float" db-attribute-path="REAL_COLUMN"/> - <obj-attribute name="smallintColumn" type="java.lang.Short" db-attribute-path="SMALLINT_COLUMN"/> - <obj-attribute name="timeColumn" type="java.util.Date" db-attribute-path="TIME_COLUMN"/> - <obj-attribute name="timestampColumn" type="java.util.Date" db-attribute-path="TIMESTAMP_COLUMN"/> - <obj-attribute name="tinyintColumn" type="java.lang.Byte" db-attribute-path="TINYINT_COLUMN"/> - <obj-attribute name="varcharColumn" type="java.lang.String" db-attribute-path="VARCHAR_COLUMN"/> - <obj-attribute name="nvarcharColumn" type="java.lang.String" db-attribute-path="NVARCHAR_COLUMN"/> - </obj-entity> - <obj-entity name="ReturnTypesMap2" className="org.apache.cayenne.testdo.return_types.ReturnTypesMap2" clientClassName="test.client.ReturnTypesMap2" dbEntityName="TYPES_MAPPING_TEST2" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> - <obj-attribute name="binaryColumn" type="byte[]" db-attribute-path="BINARY_COLUMN"/> - <obj-attribute name="blobColumn" type="byte[]" db-attribute-path="BLOB_COLUMN"/> - <obj-attribute name="longvarbinaryColumn" type="byte[]" db-attribute-path="LONGVARBINARY_COLUMN"/> - <obj-attribute name="varbinaryColumn" type="byte[]" db-attribute-path="VARBINARY_COLUMN"/> - </obj-entity> - <obj-entity name="ReturnTypesMapLobs1" className="org.apache.cayenne.testdo.return_types.ReturnTypesMapLobs1" clientClassName="test.client.ReturnTypesMapLobs1" dbEntityName="TYPES_MAPPING_LOBS_TEST1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> - <obj-attribute name="clobColumn" type="java.lang.String" db-attribute-path="CLOB_COLUMN"/> - <obj-attribute name="nclobColumn" type="java.lang.String" db-attribute-path="NCLOB_COLUMN"/> - </obj-entity> - <query name="SelectReturnTypesLobsMap1" type="SQLTemplate" root="data-map" root-name="return-types"> - <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/> - <sql><![CDATA[SELECT * FROM TYPES_MAPPING_LOBS_TEST1]]></sql> - </query> - <query name="SelectReturnTypesMap1" type="SQLTemplate" root="data-map" root-name="return-types"> - <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/> - <property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/> - <sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST1]]></sql> - </query> - <query name="SelectReturnTypesMap2" type="SQLTemplate" root="data-map" root-name="return-types"> - <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/> - <property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/> - <sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST2]]></sql> - </query> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.return_types"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="TYPES_MAPPING_LOBS_TEST1"> + <db-attribute name="AAAID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="CLOB_COLUMN" type="CLOB"/> + <db-attribute name="NCLOB_COLUMN" type="NCLOB"/> + </db-entity> + <db-entity name="TYPES_MAPPING_TEST1"> + <db-attribute name="AAAID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="BIGINT_COLUMN" type="BIGINT"/> + <db-attribute name="BIT_COLUMN" type="BIT"/> + <db-attribute name="BOOLEAN_COLUMN" type="BOOLEAN"/> + <db-attribute name="CHAR_COLUMN" type="CHAR" length="254"/> + <db-attribute name="DATE_COLUMN" type="DATE"/> + <db-attribute name="DECIMAL_COLUMN" type="DECIMAL" length="12" scale="5"/> + <db-attribute name="DOUBLE_COLUMN" type="DOUBLE" scale="7"/> + <db-attribute name="FLOAT_COLUMN" type="FLOAT" scale="3"/> + <db-attribute name="INTEGER_COLUMN" type="INTEGER"/> + <db-attribute name="LONGNVARCHAR_COLUMN" type="LONGNVARCHAR"/> + <db-attribute name="LONGVARCHAR_COLUMN" type="LONGVARCHAR"/> + <db-attribute name="NCHAR_COLUMN" type="NCHAR" length="254"/> + <db-attribute name="NUMERIC_COLUMN" type="NUMERIC" length="12" scale="5"/> + <db-attribute name="NVARCHAR_COLUMN" type="NVARCHAR" length="255"/> + <db-attribute name="REAL_COLUMN" type="REAL" scale="5"/> + <db-attribute name="SMALLINT_COLUMN" type="SMALLINT"/> + <db-attribute name="TIMESTAMP_COLUMN" type="TIMESTAMP"/> + <db-attribute name="TIME_COLUMN" type="TIME"/> + <db-attribute name="TINYINT_COLUMN" type="TINYINT"/> + <db-attribute name="VARCHAR_COLUMN" type="VARCHAR" length="255"/> + </db-entity> + <db-entity name="TYPES_MAPPING_TEST2"> + <db-attribute name="AAAID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="BINARY_COLUMN" type="BINARY" length="14"/> + <db-attribute name="BLOB_COLUMN" type="BLOB"/> + <db-attribute name="LONGVARBINARY_COLUMN" type="LONGVARBINARY"/> + <db-attribute name="VARBINARY_COLUMN" type="VARBINARY" length="1000"/> + </db-entity> + <obj-entity name="ReturnTypesMap1" className="org.apache.cayenne.testdo.return_types.ReturnTypesMap1" clientClassName="test.client.ReturnTypesMap1" dbEntityName="TYPES_MAPPING_TEST1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> + <obj-attribute name="bigintColumn" type="java.lang.Long" db-attribute-path="BIGINT_COLUMN"/> + <obj-attribute name="bitColumn" type="java.lang.Boolean" db-attribute-path="BIT_COLUMN"/> + <obj-attribute name="booleanColumn" type="java.lang.Boolean" db-attribute-path="BOOLEAN_COLUMN"/> + <obj-attribute name="charColumn" type="java.lang.String" db-attribute-path="CHAR_COLUMN"/> + <obj-attribute name="dateColumn" type="java.util.Date" db-attribute-path="DATE_COLUMN"/> + <obj-attribute name="decimalColumn" type="java.math.BigDecimal" db-attribute-path="DECIMAL_COLUMN"/> + <obj-attribute name="doubleColumn" type="java.lang.Double" db-attribute-path="DOUBLE_COLUMN"/> + <obj-attribute name="floatColumn" type="java.lang.Float" db-attribute-path="FLOAT_COLUMN"/> + <obj-attribute name="integerColumn" type="java.lang.Integer" db-attribute-path="INTEGER_COLUMN"/> + <obj-attribute name="longnvarcharColumn" type="java.lang.String" db-attribute-path="LONGNVARCHAR_COLUMN"/> + <obj-attribute name="longvarcharColumn" type="java.lang.String" db-attribute-path="LONGVARCHAR_COLUMN"/> + <obj-attribute name="ncharColumn" type="java.lang.String" db-attribute-path="NCHAR_COLUMN"/> + <obj-attribute name="numericColumn" type="java.math.BigDecimal" db-attribute-path="NUMERIC_COLUMN"/> + <obj-attribute name="nvarcharColumn" type="java.lang.String" db-attribute-path="NVARCHAR_COLUMN"/> + <obj-attribute name="realColumn" type="java.lang.Float" db-attribute-path="REAL_COLUMN"/> + <obj-attribute name="smallintColumn" type="java.lang.Short" db-attribute-path="SMALLINT_COLUMN"/> + <obj-attribute name="timeColumn" type="java.util.Date" db-attribute-path="TIME_COLUMN"/> + <obj-attribute name="timestampColumn" type="java.util.Date" db-attribute-path="TIMESTAMP_COLUMN"/> + <obj-attribute name="tinyintColumn" type="java.lang.Byte" db-attribute-path="TINYINT_COLUMN"/> + <obj-attribute name="varcharColumn" type="java.lang.String" db-attribute-path="VARCHAR_COLUMN"/> + </obj-entity> + <obj-entity name="ReturnTypesMap2" className="org.apache.cayenne.testdo.return_types.ReturnTypesMap2" clientClassName="test.client.ReturnTypesMap2" dbEntityName="TYPES_MAPPING_TEST2" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> + <obj-attribute name="binaryColumn" type="byte[]" db-attribute-path="BINARY_COLUMN"/> + <obj-attribute name="blobColumn" type="byte[]" db-attribute-path="BLOB_COLUMN"/> + <obj-attribute name="longvarbinaryColumn" type="byte[]" db-attribute-path="LONGVARBINARY_COLUMN"/> + <obj-attribute name="varbinaryColumn" type="byte[]" db-attribute-path="VARBINARY_COLUMN"/> + </obj-entity> + <obj-entity name="ReturnTypesMapLobs1" className="org.apache.cayenne.testdo.return_types.ReturnTypesMapLobs1" clientClassName="test.client.ReturnTypesMapLobs1" dbEntityName="TYPES_MAPPING_LOBS_TEST1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> + <obj-attribute name="clobColumn" type="java.lang.String" db-attribute-path="CLOB_COLUMN"/> + <obj-attribute name="nclobColumn" type="java.lang.String" db-attribute-path="NCLOB_COLUMN"/> + </obj-entity> + <query name="SelectReturnTypesLobsMap1" type="SQLTemplate" root="data-map" root-name="return-types"> + <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/> + <sql><![CDATA[SELECT * FROM TYPES_MAPPING_LOBS_TEST1]]></sql> + </query> + <query name="SelectReturnTypesMap1" type="SQLTemplate" root="data-map" root-name="return-types"> + <property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/> + <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/> + <sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST1]]></sql> + </query> + <query name="SelectReturnTypesMap2" type="SQLTemplate" root="data-map" root-name="return-types"> + <property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/> + <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/> + <sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST2]]></sql> + </query> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/soft-delete.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/soft-delete.map.xml b/cayenne-server/src/test/resources/soft-delete.map.xml index dbd91c8..64a443b 100644 --- a/cayenne-server/src/test/resources/soft-delete.map.xml +++ b/cayenne-server/src/test/resources/soft-delete.map.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.soft_delete"/> - <db-entity name="SOFT_DELETE"> - <db-attribute name="DELETED" type="BOOLEAN"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="100"/> - <qualifier><![CDATA[DELETED = false]]></qualifier> - </db-entity> - <obj-entity name="SoftDelete" className="org.apache.cayenne.testdo.soft_delete.SoftDelete" dbEntityName="SOFT_DELETE"> - <obj-attribute name="deleted" type="java.lang.Boolean" db-attribute-path="DELETED"/> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - <post-add method-name="onPrePersist"/> - </obj-entity> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.soft_delete"/> + <db-entity name="SOFT_DELETE"> + <db-attribute name="DELETED" type="BOOLEAN"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="100"/> + <qualifier><![CDATA[DELETED = false]]></qualifier> + </db-entity> + <obj-entity name="SoftDelete" className="org.apache.cayenne.testdo.soft_delete.SoftDelete" dbEntityName="SOFT_DELETE"> + <obj-attribute name="deleted" type="java.lang.Boolean" db-attribute-path="DELETED"/> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + <post-add method-name="onPrePersist"/> + </obj-entity> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/sus-map.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/sus-map.map.xml b/cayenne-server/src/test/resources/sus-map.map.xml index 6889dfa..cf4f5ea 100644 --- a/cayenne-server/src/test/resources/sus-map.map.xml +++ b/cayenne-server/src/test/resources/sus-map.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <db-entity name="SUS1"> <db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> <db-attribute name="strNoMandatory" type="VARCHAR" length="200"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/table-primitives.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/table-primitives.map.xml b/cayenne-server/src/test/resources/table-primitives.map.xml index e09d406..75d82a9 100644 --- a/cayenne-server/src/test/resources/table-primitives.map.xml +++ b/cayenne-server/src/test/resources/table-primitives.map.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.table_primitives"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="org.apache.cayenne.testdo.table_primitives"/> - <db-entity name="TABLE_PRIMITIVES"> - <db-attribute name="BOOLEAN_COLUMN" type="BOOLEAN"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="INT_COLUMN" type="INTEGER"/> - </db-entity> - <obj-entity name="TablePrimitives" className="org.apache.cayenne.testdo.table_primitives.TablePrimitives" clientClassName="org.apache.cayenne.testdo.table_primitives.ClientTablePrimitives" dbEntityName="TABLE_PRIMITIVES"> - <obj-attribute name="booleanColumn" type="boolean" db-attribute-path="BOOLEAN_COLUMN"/> - <obj-attribute name="intColumn" type="int" db-attribute-path="INT_COLUMN"/> - </obj-entity> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.table_primitives"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="org.apache.cayenne.testdo.table_primitives"/> + <db-entity name="TABLE_PRIMITIVES"> + <db-attribute name="BOOLEAN_COLUMN" type="BOOLEAN"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="INT_COLUMN" type="INTEGER"/> + </db-entity> + <obj-entity name="TablePrimitives" className="org.apache.cayenne.testdo.table_primitives.TablePrimitives" clientClassName="org.apache.cayenne.testdo.table_primitives.ClientTablePrimitives" dbEntityName="TABLE_PRIMITIVES"> + <obj-attribute name="booleanColumn" type="boolean" db-attribute-path="BOOLEAN_COLUMN"/> + <obj-attribute name="intColumn" type="int" db-attribute-path="INT_COLUMN"/> + </obj-entity> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/testmap.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/testmap.map.xml b/cayenne-server/src/test/resources/testmap.map.xml index 8e082d9..1ce62c2 100644 --- a/cayenne-server/src/test/resources/testmap.map.xml +++ b/cayenne-server/src/test/resources/testmap.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.testmap"/> <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> <property name="clientSupported" value="true"/> @@ -19,8 +19,7 @@ <procedure name="cayenne_tst_upd_proc"> <procedure-parameter name="paintingPrice" type="INTEGER" direction="in"/> </procedure> - <procedure name="cayenne_tst_upd_proc2"> - </procedure> + <procedure name="cayenne_tst_upd_proc2"/> <db-entity name="ARTGROUP"> <db-attribute name="GROUP_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> <db-attribute name="NAME" type="VARCHAR" isMandatory="true" length="100"/> @@ -89,7 +88,7 @@ <obj-attribute name="artistName" type="java.lang.String" db-attribute-path="ARTIST_NAME"/> <obj-attribute name="dateOfBirth" type="java.util.Date" db-attribute-path="DATE_OF_BIRTH"/> </obj-entity> - <obj-entity name="ArtistCallback" className="org.apache.cayenne.testdo.testmap.ArtistCallback" dbEntityName="ARTIST_CT" exclude-superclass-listeners="true" exclude-default-listeners="true"> + <obj-entity name="ArtistCallback" className="org.apache.cayenne.testdo.testmap.ArtistCallback" dbEntityName="ARTIST_CT"> <obj-attribute name="artistName" type="java.lang.String"/> <obj-attribute name="dateOfBirth" type="java.util.Date"/> <post-add method-name="prePersistEntityObjEntity"/> @@ -100,8 +99,7 @@ <post-remove method-name="postRemoveEntityObjEntity"/> <post-load method-name="postLoadEntityObjEntity"/> </obj-entity> - <obj-entity name="ArtistExhibit" className="org.apache.cayenne.testdo.testmap.ArtistExhibit" dbEntityName="ARTIST_EXHIBIT"> - </obj-entity> + <obj-entity name="ArtistExhibit" className="org.apache.cayenne.testdo.testmap.ArtistExhibit" dbEntityName="ARTIST_EXHIBIT"/> <obj-entity name="CompoundPainting" className="org.apache.cayenne.testdo.testmap.CompoundPainting" dbEntityName="PAINTING"> <obj-attribute name="artistName" type="java.lang.String" db-attribute-path="toArtist.ARTIST_NAME"/> <obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/> @@ -166,7 +164,7 @@ <db-relationship name="toChildGroups" source="ARTGROUP" target="ARTGROUP" toMany="true"> <db-attribute-pair source="GROUP_ID" target="PARENT_GROUP_ID"/> </db-relationship> - <db-relationship name="toParentGroup" source="ARTGROUP" target="ARTGROUP" toMany="false"> + <db-relationship name="toParentGroup" source="ARTGROUP" target="ARTGROUP"> <db-attribute-pair source="PARENT_GROUP_ID" target="GROUP_ID"/> </db-relationship> <db-relationship name="artistExhibitArray" source="ARTIST" target="ARTIST_EXHIBIT" toDependentPK="true" toMany="true"> @@ -178,22 +176,22 @@ <db-relationship name="paintingArray" source="ARTIST" target="PAINTING" toMany="true"> <db-attribute-pair source="ARTIST_ID" target="ARTIST_ID"/> </db-relationship> - <db-relationship name="toArtist" source="ARTIST_EXHIBIT" target="ARTIST" toMany="false"> + <db-relationship name="toArtist" source="ARTIST_EXHIBIT" target="ARTIST"> <db-attribute-pair source="ARTIST_ID" target="ARTIST_ID"/> </db-relationship> - <db-relationship name="toExhibit" source="ARTIST_EXHIBIT" target="EXHIBIT" toMany="false"> + <db-relationship name="toExhibit" source="ARTIST_EXHIBIT" target="EXHIBIT"> <db-attribute-pair source="EXHIBIT_ID" target="EXHIBIT_ID"/> </db-relationship> - <db-relationship name="toArtist" source="ARTIST_GROUP" target="ARTIST" toMany="false"> + <db-relationship name="toArtist" source="ARTIST_GROUP" target="ARTIST"> <db-attribute-pair source="ARTIST_ID" target="ARTIST_ID"/> </db-relationship> - <db-relationship name="toGroup" source="ARTIST_GROUP" target="ARTGROUP" toMany="false"> + <db-relationship name="toGroup" source="ARTIST_GROUP" target="ARTGROUP"> <db-attribute-pair source="GROUP_ID" target="GROUP_ID"/> </db-relationship> <db-relationship name="artistExhibitArray" source="EXHIBIT" target="ARTIST_EXHIBIT" toDependentPK="true" toMany="true"> <db-attribute-pair source="EXHIBIT_ID" target="EXHIBIT_ID"/> </db-relationship> - <db-relationship name="toGallery" source="EXHIBIT" target="GALLERY" toMany="false"> + <db-relationship name="toGallery" source="EXHIBIT" target="GALLERY"> <db-attribute-pair source="GALLERY_ID" target="GALLERY_ID"/> </db-relationship> <db-relationship name="exhibitArray" source="GALLERY" target="EXHIBIT" toMany="true"> @@ -202,19 +200,19 @@ <db-relationship name="paintingArray" source="GALLERY" target="PAINTING" toMany="true"> <db-attribute-pair source="GALLERY_ID" target="GALLERY_ID"/> </db-relationship> - <db-relationship name="toArtist" source="PAINTING" target="ARTIST" toMany="false"> + <db-relationship name="toArtist" source="PAINTING" target="ARTIST"> <db-attribute-pair source="ARTIST_ID" target="ARTIST_ID"/> </db-relationship> - <db-relationship name="toGallery" source="PAINTING" target="GALLERY" toMany="false"> + <db-relationship name="toGallery" source="PAINTING" target="GALLERY"> <db-attribute-pair source="GALLERY_ID" target="GALLERY_ID"/> </db-relationship> - <db-relationship name="toPaintingInfo" source="PAINTING" target="PAINTING_INFO" toDependentPK="true" toMany="false"> + <db-relationship name="toPaintingInfo" source="PAINTING" target="PAINTING_INFO" toDependentPK="true"> <db-attribute-pair source="PAINTING_ID" target="PAINTING_ID"/> </db-relationship> - <db-relationship name="toArtist" source="PAINTING1" target="ARTIST" toMany="false"> + <db-relationship name="toArtist" source="PAINTING1" target="ARTIST"> <db-attribute-pair source="ARTIST_ID" target="ARTIST_ID"/> </db-relationship> - <db-relationship name="painting" source="PAINTING_INFO" target="PAINTING" toMany="false"> + <db-relationship name="painting" source="PAINTING_INFO" target="PAINTING"> <db-attribute-pair source="PAINTING_ID" target="PAINTING_ID"/> </db-relationship> <obj-relationship name="artistArray" source="ArtGroup" target="Artist" deleteRule="Nullify" db-relationship-path="artistGroupArray.toArtist"/> @@ -271,8 +269,7 @@ VALUES (#bind($id), #bind($title), #bind($price))]]></sql> <property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/> <qualifier><![CDATA[artistName like $name]]></qualifier> </query> - <query name="ProcedureQuery" type="ProcedureQuery" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist"> - </query> + <query name="ProcedureQuery" type="ProcedureQuery" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist"/> <query name="QueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="Artist"> <property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/> </query> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/things.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/things.map.xml b/cayenne-server/src/test/resources/things.map.xml index 3212d70..fc6158f 100644 --- a/cayenne-server/src/test/resources/things.map.xml +++ b/cayenne-server/src/test/resources/things.map.xml @@ -1,110 +1,110 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.things"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="BAG"> - <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="200"/> - </db-entity> - <db-entity name="BALL"> - <db-attribute name="BOX_ID" type="BIGINT" isMandatory="true"/> - <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="THING_VOLUME" type="INTEGER" isMandatory="true"/> - <db-attribute name="THING_WEIGHT" type="INTEGER" isMandatory="true"/> - </db-entity> - <db-entity name="BOX"> - <db-attribute name="BAG_ID" type="BIGINT" isMandatory="true"/> - <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="200"/> - </db-entity> - <db-entity name="BOX_INFO"> - <db-attribute name="BOX_ID" type="BIGINT" isMandatory="true"/> - <db-attribute name="COLOR" type="VARCHAR" isMandatory="true" length="200"/> - <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="BOX_THING"> - <db-attribute name="BOX_ID" type="BIGINT" isMandatory="true"/> - <db-attribute name="THING_VOLUME" type="INTEGER" isMandatory="true"/> - <db-attribute name="THING_WEIGHT" type="INTEGER" isMandatory="true"/> - </db-entity> - <db-entity name="THING"> - <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="VOLUME" type="INTEGER" isMandatory="true"/> - <db-attribute name="WEIGHT" type="INTEGER" isMandatory="true"/> - </db-entity> - <obj-entity name="Bag" className="org.apache.cayenne.testdo.things.Bag" clientClassName="test.client.Bag" dbEntityName="BAG" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="Ball" className="org.apache.cayenne.testdo.things.Ball" clientClassName="test.client.Ball" dbEntityName="BALL" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> - <obj-attribute name="thingVolume" type="java.lang.Integer" db-attribute-path="THING_VOLUME"/> - <obj-attribute name="thingWeight" type="java.lang.Integer" db-attribute-path="THING_WEIGHT"/> - </obj-entity> - <obj-entity name="Box" className="org.apache.cayenne.testdo.things.Box" clientClassName="test.client.Box" dbEntityName="BOX" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="BoxInfo" className="org.apache.cayenne.testdo.things.BoxInfo" clientClassName="test.client.BoxInfo" dbEntityName="BOX_INFO" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> - <obj-attribute name="color" type="java.lang.String" db-attribute-path="COLOR"/> - </obj-entity> - <obj-entity name="Thing" className="org.apache.cayenne.testdo.things.Thing" clientClassName="test.client.Thing" dbEntityName="THING" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> - <obj-attribute name="volume" type="java.lang.Integer" db-attribute-path="VOLUME"/> - <obj-attribute name="weight" type="java.lang.Integer" db-attribute-path="WEIGHT"/> - </obj-entity> - <db-relationship name="BOXES" source="BAG" target="BOX" toMany="true"> - <db-attribute-pair source="ID" target="BAG_ID"/> - </db-relationship> - <db-relationship name="BOX" source="BALL" target="BOX" toMany="false"> - <db-attribute-pair source="BOX_ID" target="ID"/> - </db-relationship> - <db-relationship name="THING" source="BALL" target="THING" toMany="false"> - <db-attribute-pair source="THING_VOLUME" target="VOLUME"/> - <db-attribute-pair source="THING_WEIGHT" target="WEIGHT"/> - </db-relationship> - <db-relationship name="BAG" source="BOX" target="BAG" toMany="false"> - <db-attribute-pair source="BAG_ID" target="ID"/> - </db-relationship> - <db-relationship name="BALLS" source="BOX" target="BALL" toMany="true"> - <db-attribute-pair source="ID" target="BOX_ID"/> - </db-relationship> - <db-relationship name="BOX_INFO" source="BOX" target="BOX_INFO" toMany="false"> - <db-attribute-pair source="ID" target="BOX_ID"/> - </db-relationship> - <db-relationship name="BOX_THING" source="BOX" target="BOX_THING" toMany="true"> - <db-attribute-pair source="ID" target="BOX_ID"/> - </db-relationship> - <db-relationship name="BOX" source="BOX_INFO" target="BOX" toMany="false"> - <db-attribute-pair source="BOX_ID" target="ID"/> - </db-relationship> - <db-relationship name="BOX" source="BOX_THING" target="BOX" toMany="false"> - <db-attribute-pair source="BOX_ID" target="ID"/> - </db-relationship> - <db-relationship name="THING" source="BOX_THING" target="THING" toMany="false"> - <db-attribute-pair source="THING_VOLUME" target="VOLUME"/> - <db-attribute-pair source="THING_WEIGHT" target="WEIGHT"/> - </db-relationship> - <db-relationship name="BALL" source="THING" target="BALL" toMany="false"> - <db-attribute-pair source="VOLUME" target="THING_VOLUME"/> - <db-attribute-pair source="WEIGHT" target="THING_WEIGHT"/> - </db-relationship> - <db-relationship name="BOX_THING" source="THING" target="BOX_THING" toMany="true"> - <db-attribute-pair source="VOLUME" target="THING_VOLUME"/> - <db-attribute-pair source="WEIGHT" target="THING_WEIGHT"/> - </db-relationship> - <obj-relationship name="balls" source="Bag" target="Ball" deleteRule="Deny" db-relationship-path="BOXES.BALLS"/> - <obj-relationship name="boxes" source="Bag" target="Box" deleteRule="Deny" db-relationship-path="BOXES"/> - <obj-relationship name="things" source="Bag" target="Thing" deleteRule="Deny" db-relationship-path="BOXES.BOX_THING.THING"/> - <obj-relationship name="box" source="Ball" target="Box" deleteRule="Nullify" db-relationship-path="BOX"/> - <obj-relationship name="thing" source="Ball" target="Thing" deleteRule="Nullify" db-relationship-path="THING"/> - <obj-relationship name="bag" source="Box" target="Bag" deleteRule="Nullify" db-relationship-path="BAG"/> - <obj-relationship name="balls" source="Box" target="Ball" deleteRule="Deny" db-relationship-path="BALLS"/> - <obj-relationship name="boxInfo" source="Box" target="BoxInfo" deleteRule="Deny" db-relationship-path="BOX_INFO"/> - <obj-relationship name="things" source="Box" target="Thing" deleteRule="Deny" db-relationship-path="BOX_THING.THING"/> - <obj-relationship name="box" source="BoxInfo" target="Box" deleteRule="Nullify" db-relationship-path="BOX"/> - <obj-relationship name="ball" source="Thing" target="Ball" deleteRule="Nullify" db-relationship-path="BALL"/> - <obj-relationship name="box" source="Thing" target="Box" deleteRule="Deny" db-relationship-path="BOX_THING.BOX"/> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.things"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="BAG"> + <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="200"/> + </db-entity> + <db-entity name="BALL"> + <db-attribute name="BOX_ID" type="BIGINT" isMandatory="true"/> + <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="THING_VOLUME" type="INTEGER" isMandatory="true"/> + <db-attribute name="THING_WEIGHT" type="INTEGER" isMandatory="true"/> + </db-entity> + <db-entity name="BOX"> + <db-attribute name="BAG_ID" type="BIGINT" isMandatory="true"/> + <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="200"/> + </db-entity> + <db-entity name="BOX_INFO"> + <db-attribute name="BOX_ID" type="BIGINT" isMandatory="true"/> + <db-attribute name="COLOR" type="VARCHAR" isMandatory="true" length="200"/> + <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="BOX_THING"> + <db-attribute name="BOX_ID" type="BIGINT" isMandatory="true"/> + <db-attribute name="THING_VOLUME" type="INTEGER" isMandatory="true"/> + <db-attribute name="THING_WEIGHT" type="INTEGER" isMandatory="true"/> + </db-entity> + <db-entity name="THING"> + <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="VOLUME" type="INTEGER" isMandatory="true"/> + <db-attribute name="WEIGHT" type="INTEGER" isMandatory="true"/> + </db-entity> + <obj-entity name="Bag" className="org.apache.cayenne.testdo.things.Bag" clientClassName="test.client.Bag" dbEntityName="BAG" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="Ball" className="org.apache.cayenne.testdo.things.Ball" clientClassName="test.client.Ball" dbEntityName="BALL" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> + <obj-attribute name="thingVolume" type="java.lang.Integer" db-attribute-path="THING_VOLUME"/> + <obj-attribute name="thingWeight" type="java.lang.Integer" db-attribute-path="THING_WEIGHT"/> + </obj-entity> + <obj-entity name="Box" className="org.apache.cayenne.testdo.things.Box" clientClassName="test.client.Box" dbEntityName="BOX" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="BoxInfo" className="org.apache.cayenne.testdo.things.BoxInfo" clientClassName="test.client.BoxInfo" dbEntityName="BOX_INFO" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> + <obj-attribute name="color" type="java.lang.String" db-attribute-path="COLOR"/> + </obj-entity> + <obj-entity name="Thing" className="org.apache.cayenne.testdo.things.Thing" clientClassName="test.client.Thing" dbEntityName="THING" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> + <obj-attribute name="volume" type="java.lang.Integer" db-attribute-path="VOLUME"/> + <obj-attribute name="weight" type="java.lang.Integer" db-attribute-path="WEIGHT"/> + </obj-entity> + <db-relationship name="BOXES" source="BAG" target="BOX" toMany="true"> + <db-attribute-pair source="ID" target="BAG_ID"/> + </db-relationship> + <db-relationship name="BOX" source="BALL" target="BOX"> + <db-attribute-pair source="BOX_ID" target="ID"/> + </db-relationship> + <db-relationship name="THING" source="BALL" target="THING"> + <db-attribute-pair source="THING_VOLUME" target="VOLUME"/> + <db-attribute-pair source="THING_WEIGHT" target="WEIGHT"/> + </db-relationship> + <db-relationship name="BAG" source="BOX" target="BAG"> + <db-attribute-pair source="BAG_ID" target="ID"/> + </db-relationship> + <db-relationship name="BALLS" source="BOX" target="BALL" toMany="true"> + <db-attribute-pair source="ID" target="BOX_ID"/> + </db-relationship> + <db-relationship name="BOX_INFO" source="BOX" target="BOX_INFO"> + <db-attribute-pair source="ID" target="BOX_ID"/> + </db-relationship> + <db-relationship name="BOX_THING" source="BOX" target="BOX_THING" toMany="true"> + <db-attribute-pair source="ID" target="BOX_ID"/> + </db-relationship> + <db-relationship name="BOX" source="BOX_INFO" target="BOX"> + <db-attribute-pair source="BOX_ID" target="ID"/> + </db-relationship> + <db-relationship name="BOX" source="BOX_THING" target="BOX"> + <db-attribute-pair source="BOX_ID" target="ID"/> + </db-relationship> + <db-relationship name="THING" source="BOX_THING" target="THING"> + <db-attribute-pair source="THING_VOLUME" target="VOLUME"/> + <db-attribute-pair source="THING_WEIGHT" target="WEIGHT"/> + </db-relationship> + <db-relationship name="BALL" source="THING" target="BALL"> + <db-attribute-pair source="VOLUME" target="THING_VOLUME"/> + <db-attribute-pair source="WEIGHT" target="THING_WEIGHT"/> + </db-relationship> + <db-relationship name="BOX_THING" source="THING" target="BOX_THING" toMany="true"> + <db-attribute-pair source="VOLUME" target="THING_VOLUME"/> + <db-attribute-pair source="WEIGHT" target="THING_WEIGHT"/> + </db-relationship> + <obj-relationship name="balls" source="Bag" target="Ball" deleteRule="Deny" db-relationship-path="BOXES.BALLS"/> + <obj-relationship name="boxes" source="Bag" target="Box" deleteRule="Deny" db-relationship-path="BOXES"/> + <obj-relationship name="things" source="Bag" target="Thing" deleteRule="Deny" db-relationship-path="BOXES.BOX_THING.THING"/> + <obj-relationship name="box" source="Ball" target="Box" deleteRule="Nullify" db-relationship-path="BOX"/> + <obj-relationship name="thing" source="Ball" target="Thing" deleteRule="Nullify" db-relationship-path="THING"/> + <obj-relationship name="bag" source="Box" target="Bag" deleteRule="Nullify" db-relationship-path="BAG"/> + <obj-relationship name="balls" source="Box" target="Ball" deleteRule="Deny" db-relationship-path="BALLS"/> + <obj-relationship name="boxInfo" source="Box" target="BoxInfo" deleteRule="Deny" db-relationship-path="BOX_INFO"/> + <obj-relationship name="things" source="Box" target="Thing" deleteRule="Deny" db-relationship-path="BOX_THING.THING"/> + <obj-relationship name="box" source="BoxInfo" target="Box" deleteRule="Nullify" db-relationship-path="BOX"/> + <obj-relationship name="ball" source="Thing" target="Ball" deleteRule="Nullify" db-relationship-path="BALL"/> + <obj-relationship name="box" source="Thing" target="Box" deleteRule="Deny" db-relationship-path="BOX_THING.BOX"/> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/toone.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/toone.map.xml b/cayenne-server/src/test/resources/toone.map.xml index f206e6e..ba31399 100644 --- a/cayenne-server/src/test/resources/toone.map.xml +++ b/cayenne-server/src/test/resources/toone.map.xml @@ -1,27 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.toone"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="org.apache.cayenne.testdo.toone"/> - <db-entity name="TOONE_DEP"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="TOONE_MASTER"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <obj-entity name="TooneDep" className="org.apache.cayenne.testdo.toone.TooneDep" clientClassName="org.apache.cayenne.testdo.toone.ClientTooneDep" dbEntityName="TOONE_DEP"> - </obj-entity> - <obj-entity name="TooneMaster" className="org.apache.cayenne.testdo.toone.TooneMaster" clientClassName="org.apache.cayenne.testdo.toone.ClientTooneMaster" dbEntityName="TOONE_MASTER"> - </obj-entity> - <db-relationship name="toMaster" source="TOONE_DEP" target="TOONE_MASTER" toMany="false"> - <db-attribute-pair source="ID" target="ID"/> - </db-relationship> - <db-relationship name="toDependent" source="TOONE_MASTER" target="TOONE_DEP" toDependentPK="true" toMany="false"> - <db-attribute-pair source="ID" target="ID"/> - </db-relationship> - <obj-relationship name="toMaster" source="TooneDep" target="TooneMaster" deleteRule="Nullify" db-relationship-path="toMaster"/> - <obj-relationship name="toDependent" source="TooneMaster" target="TooneDep" deleteRule="Cascade" db-relationship-path="toDependent"/> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.toone"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="org.apache.cayenne.testdo.toone"/> + <db-entity name="TOONE_DEP"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="TOONE_MASTER"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <obj-entity name="TooneDep" className="org.apache.cayenne.testdo.toone.TooneDep" clientClassName="org.apache.cayenne.testdo.toone.ClientTooneDep" dbEntityName="TOONE_DEP"/> + <obj-entity name="TooneMaster" className="org.apache.cayenne.testdo.toone.TooneMaster" clientClassName="org.apache.cayenne.testdo.toone.ClientTooneMaster" dbEntityName="TOONE_MASTER"/> + <db-relationship name="toMaster" source="TOONE_DEP" target="TOONE_MASTER"> + <db-attribute-pair source="ID" target="ID"/> + </db-relationship> + <db-relationship name="toDependent" source="TOONE_MASTER" target="TOONE_DEP" toDependentPK="true"> + <db-attribute-pair source="ID" target="ID"/> + </db-relationship> + <obj-relationship name="toMaster" source="TooneDep" target="TooneMaster" deleteRule="Nullify" db-relationship-path="toMaster"/> + <obj-relationship name="toDependent" source="TooneMaster" target="TooneDep" deleteRule="Cascade" db-relationship-path="toDependent"/> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/unsupported-distinct-types.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/unsupported-distinct-types.map.xml b/cayenne-server/src/test/resources/unsupported-distinct-types.map.xml index 0280918..0452f5c 100644 --- a/cayenne-server/src/test/resources/unsupported-distinct-types.map.xml +++ b/cayenne-server/src/test/resources/unsupported-distinct-types.map.xml @@ -1,57 +1,57 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.unsupported_distinct_types"/> <db-entity name="COMPOSITION"> <db-attribute name="BASE_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> <db-attribute name="CONTAINED_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> </db-entity> - <db-entity name="ORDERS"> - <db-attribute name="CUSTOMER_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="PRODUCT_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> <db-entity name="CUSTOMER"> <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> <db-attribute name="LONGVARCHAR_COL" type="LONGVARCHAR"/> </db-entity> + <db-entity name="ORDERS"> + <db-attribute name="CUSTOMER_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="PRODUCT_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> <db-entity name="PRODUCT"> <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> <db-attribute name="LONGVARCHAR_COL" type="LONGVARCHAR"/> </db-entity> - <obj-entity name="Product" className="org.apache.cayenne.testdo.unsupported_distinct_types.Product" dbEntityName="PRODUCT"> + <obj-entity name="Customer" className="org.apache.cayenne.testdo.unsupported_distinct_types.Customer" dbEntityName="CUSTOMER"> <obj-attribute name="longvarcharCol" type="java.lang.String" db-attribute-path="LONGVARCHAR_COL"/> </obj-entity> - <obj-entity name="Customer" className="org.apache.cayenne.testdo.unsupported_distinct_types.Customer" dbEntityName="CUSTOMER"> + <obj-entity name="Product" className="org.apache.cayenne.testdo.unsupported_distinct_types.Product" dbEntityName="PRODUCT"> <obj-attribute name="longvarcharCol" type="java.lang.String" db-attribute-path="LONGVARCHAR_COL"/> </obj-entity> - <db-relationship name="base" source="COMPOSITION" target="PRODUCT" toMany="false"> + <db-relationship name="base" source="COMPOSITION" target="PRODUCT"> <db-attribute-pair source="BASE_ID" target="ID"/> </db-relationship> - <db-relationship name="contained" source="COMPOSITION" target="PRODUCT" toMany="false"> + <db-relationship name="contained" source="COMPOSITION" target="PRODUCT"> <db-attribute-pair source="CONTAINED_ID" target="ID"/> </db-relationship> + <db-relationship name="orderBy" source="CUSTOMER" target="ORDERS" toDependentPK="true" toMany="true"> + <db-attribute-pair source="ID" target="CUSTOMER_ID"/> + </db-relationship> + <db-relationship name="order" source="ORDERS" target="PRODUCT"> + <db-attribute-pair source="PRODUCT_ID" target="ID"/> + </db-relationship> + <db-relationship name="orderBy" source="ORDERS" target="CUSTOMER"> + <db-attribute-pair source="CUSTOMER_ID" target="ID"/> + </db-relationship> <db-relationship name="base" source="PRODUCT" target="COMPOSITION" toDependentPK="true" toMany="true"> <db-attribute-pair source="ID" target="BASE_ID"/> </db-relationship> <db-relationship name="contained" source="PRODUCT" target="COMPOSITION" toDependentPK="true" toMany="true"> <db-attribute-pair source="ID" target="CONTAINED_ID"/> </db-relationship> - <db-relationship name="order" source="ORDERS" target="PRODUCT" toMany="false"> - <db-attribute-pair source="PRODUCT_ID" target="ID"/> - </db-relationship> - <db-relationship name="orderBy" source="ORDERS" target="CUSTOMER" toMany="false"> - <db-attribute-pair source="CUSTOMER_ID" target="ID"/> - </db-relationship> <db-relationship name="order" source="PRODUCT" target="ORDERS" toDependentPK="true" toMany="true"> <db-attribute-pair source="ID" target="PRODUCT_ID"/> </db-relationship> - <db-relationship name="orderBy" source="CUSTOMER" target="ORDERS" toDependentPK="true" toMany="true"> - <db-attribute-pair source="ID" target="CUSTOMER_ID"/> - </db-relationship> + <obj-relationship name="order" source="Customer" target="Product" deleteRule="Deny" db-relationship-path="orderBy.order"/> <obj-relationship name="base" source="Product" target="Product" deleteRule="Deny" db-relationship-path="contained.base"/> <obj-relationship name="contained" source="Product" target="Product" deleteRule="Deny" db-relationship-path="base.contained"/> <obj-relationship name="orderBy" source="Product" target="Customer" deleteRule="Deny" db-relationship-path="order.orderBy"/> - <obj-relationship name="order" source="Customer" target="Product" deleteRule="Deny" db-relationship-path="orderBy.order"/> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/url conversion/cayenne-empty.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/url conversion/cayenne-empty.xml b/cayenne-server/src/test/resources/url conversion/cayenne-empty.xml new file mode 100644 index 0000000..3ee43c4 --- /dev/null +++ b/cayenne-server/src/test/resources/url conversion/cayenne-empty.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<domain project-version="9"> + <map name="empty"/> +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/url conversion/empty.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/url conversion/empty.map.xml b/cayenne-server/src/test/resources/url conversion/empty.map.xml new file mode 100644 index 0000000..89734f3 --- /dev/null +++ b/cayenne-server/src/test/resources/url conversion/empty.map.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; + project-version="9"> + <db-entity name="EMPTY"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/uuid.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/uuid.map.xml b/cayenne-server/src/test/resources/uuid.map.xml index 1f38102..2622564 100644 --- a/cayenne-server/src/test/resources/uuid.map.xml +++ b/cayenne-server/src/test/resources/uuid.map.xml @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.uuid"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="UUID_PK_ENTITY"> - <db-attribute name="ID" type="VARCHAR" isPrimaryKey="true" isMandatory="true" length="100"/> - </db-entity> - <db-entity name="UUID_TEST"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="UUID" type="VARCHAR" length="100"/> - </db-entity> - <obj-entity name="UuidPkEntity" className="org.apache.cayenne.testdo.uuid.UuidPkEntity" dbEntityName="UUID_PK_ENTITY"> - <obj-attribute name="id" type="java.util.UUID" db-attribute-path="ID"/> - </obj-entity> - <obj-entity name="UuidTestEntity" className="org.apache.cayenne.testdo.uuid.UuidTestEntity" dbEntityName="UUID_TEST"> - <obj-attribute name="uuid" type="java.util.UUID" db-attribute-path="UUID"/> - </obj-entity> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.uuid"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="UUID_PK_ENTITY"> + <db-attribute name="ID" type="VARCHAR" isPrimaryKey="true" isMandatory="true" length="100"/> + </db-entity> + <db-entity name="UUID_TEST"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="UUID" type="VARCHAR" length="100"/> + </db-entity> + <obj-entity name="UuidPkEntity" className="org.apache.cayenne.testdo.uuid.UuidPkEntity" dbEntityName="UUID_PK_ENTITY"> + <obj-attribute name="id" type="java.util.UUID" db-attribute-path="ID"/> + </obj-entity> + <obj-entity name="UuidTestEntity" className="org.apache.cayenne.testdo.uuid.UuidTestEntity" dbEntityName="UUID_TEST"> + <obj-attribute name="uuid" type="java.util.UUID" db-attribute-path="UUID"/> + </obj-entity> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/weighted-sort.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/weighted-sort.map.xml b/cayenne-server/src/test/resources/weighted-sort.map.xml index ac01ec5..25684af 100644 --- a/cayenne-server/src/test/resources/weighted-sort.map.xml +++ b/cayenne-server/src/test/resources/weighted-sort.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.weighted_sort"/> <db-entity name="SORT_DEP"> <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> @@ -11,11 +11,9 @@ <db-entity name="SORT_ROOT"> <db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> </db-entity> - <obj-entity name="SortDep" className="org.apache.cayenne.testdo.weighted_sort.SortDep" dbEntityName="SORT_DEP"> - </obj-entity> - <obj-entity name="SortRoot" className="org.apache.cayenne.testdo.weighted_sort.SortRoot" dbEntityName="SORT_ROOT"> - </obj-entity> - <db-relationship name="root" source="SORT_DEP" target="SORT_ROOT" toMany="false"> + <obj-entity name="SortDep" className="org.apache.cayenne.testdo.weighted_sort.SortDep" dbEntityName="SORT_DEP"/> + <obj-entity name="SortRoot" className="org.apache.cayenne.testdo.weighted_sort.SortRoot" dbEntityName="SORT_ROOT"/> + <db-relationship name="root" source="SORT_DEP" target="SORT_ROOT"> <db-attribute-pair source="ROOT_ID" target="ID"/> </db-relationship> <db-relationship name="deps" source="SORT_ROOT" target="SORT_DEP" toMany="true">
