You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2006/10/05 23:14:04 UTC
svn commit: r453382 - in /db/jdo/trunk/tck20/src:
orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/
orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/
sql/derby/applicationidentity/ sql/derby/datastoreidentity/
Author: mcaisse
Date: Thu Oct 5 14:14:03 2006
New Revision: 453382
URL: http://svn.apache.org/viewvc?view=rev&rev=453382
Log:
JDO-430
Modified:
db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema10.sql
db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema10.sql
Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm?view=diff&rev=453382&r1=453381&r2=453382
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm Thu Oct 5 14:14:03 2006
@@ -24,7 +24,7 @@
<field name="company" column="COMPANYID"/>
<!-- field type is List<Employee> -->
<field name="employees">
- <order column="hiredate"/>
+ <order column="ORDER_COL"/>
<element mapped-by="department"/>
</field>
</class>
Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm?view=diff&rev=453382&r1=453381&r2=453382
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm Thu Oct 5 14:14:03 2006
@@ -25,9 +25,9 @@
<field name="name" column="NAME"/>
<field name="company" column="COMPANYID"/>
<!-- field type is List<Employee> -->
- <field name="employees">
- <order column="hiredate"/>
- <element mapped-by="department"/>
+ <field name="employees" mapped-by="department">
+ <order column="ORDER_COL"/>
+ <!-- <element mapped-by="department"/> -->
</field>
</class>
Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema10.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema10.sql?view=diff&rev=453382&r1=453381&r2=453382
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema10.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema10.sql Thu Oct 5 14:14:03 2006
@@ -44,6 +44,7 @@
MIDDLENAME VARCHAR(32),
BIRTHDATE VARCHAR(32) NOT NULL,
DISCRIMINATOR varchar(64) NOT NULL,
+ ORDER_COL INTEGER NOT NULL,
HIREDATE VARCHAR(32),
WEEKLYHOURS REAL,
DEPARTMENT INTEGER,
Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema10.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema10.sql?view=diff&rev=453382&r1=453381&r2=453382
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema10.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema10.sql Thu Oct 5 14:14:03 2006
@@ -47,6 +47,7 @@
MIDDLENAME VARCHAR(32),
BIRTHDATE VARCHAR(32) NOT NULL,
DISCRIMINATOR varchar(64) NOT NULL,
+ ORDER_COL INTEGER NOT NULL,
HIREDATE VARCHAR(32),
WEEKLYHOURS REAL,
DEPARTMENT INTEGER,