db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject svn commit: r1022008 [2/2] - in /db/jdo/trunk/tck/src: conf/ java/org/apache/jdo/tck/pc/company/ java/org/apache/jdo/tck/pc/companyAnnotatedFC/ java/org/apache/jdo/tck/pc/companyAnnotatedJPA/ java/org/apache/jdo/tck/pc/companyAnnotatedPC/ java/org/apac...
Date Wed, 13 Oct 2010 06:43:03 GMT
Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema2.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema2.sql?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema2.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema2.sql Wed Oct 13 06:43:01 2010
@@ -54,6 +54,8 @@ DROP TABLE persons;
 DROP TABLE projects;
 DROP TABLE departments;
 DROP TABLE companies;
+DROP TABLE meetingrooms;
+DROP TABLE department_rooms;
 
 CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
@@ -80,6 +82,19 @@ CREATE TABLE departments (
         REFERENCES companies (DATASTORE_IDENTITY)
 );
 
+CREATE TABLE department_rooms (
+    DEPTID INTEGER NOT NULL,
+    ROOMID INTEGER NOT NULL,
+    ROOM_ORDER INTEGER NOT NULL
+);
+
+CREATE TABLE meetingrooms (
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID INTEGER NOT NULL,
+    NAME VARCHAR(32) NOT NULL,
+    CONSTRAINT ROOMS_PK PRIMARY KEY (DATASTORE_IDENTITY)
+);
+
 CREATE TABLE persons (
     DATASTORE_IDENTITY INTEGER NOT NULL,
     PERSONID INTEGER NOT NULL,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema3.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema3.sql?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema3.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema3.sql Wed Oct 13 06:43:01 2010
@@ -47,6 +47,8 @@ DROP TABLE persons;
 DROP TABLE projects;
 DROP TABLE departments;
 DROP TABLE companies;
+DROP TABLE meetingrooms;
+DROP TABLE department_rooms;
 
 CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
@@ -73,6 +75,19 @@ CREATE TABLE departments (
         REFERENCES companies (DATASTORE_IDENTITY)
 );
 
+CREATE TABLE department_rooms (
+    DEPTID INTEGER NOT NULL,
+    ROOMID INTEGER NOT NULL,
+    ROOM_ORDER INTEGER NOT NULL
+);
+
+CREATE TABLE meetingrooms (
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID INTEGER NOT NULL,
+    NAME VARCHAR(32) NOT NULL,
+    CONSTRAINT ROOMS_PK PRIMARY KEY (DATASTORE_IDENTITY)
+);
+
 CREATE TABLE persons (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     PERSONID INTEGER NOT NULL,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema4.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema4.sql?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema4.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema4.sql Wed Oct 13 06:43:01 2010
@@ -42,6 +42,8 @@ DROP TABLE persons;
 DROP TABLE projects;
 DROP TABLE departments;
 DROP TABLE companies;
+DROP TABLE meetingrooms;
+DROP TABLE department_rooms;
 
 CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
@@ -68,6 +70,19 @@ CREATE TABLE departments (
         REFERENCES companies (DATASTORE_IDENTITY)
 );
 
+CREATE TABLE department_rooms (
+    DEPTID INTEGER NOT NULL,
+    ROOMID INTEGER NOT NULL,
+    ROOM_ORDER INTEGER NOT NULL
+);
+
+CREATE TABLE meetingrooms (
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID INTEGER NOT NULL,
+    NAME VARCHAR(32) NOT NULL,
+    CONSTRAINT ROOMS_PK PRIMARY KEY (DATASTORE_IDENTITY)
+);
+
 CREATE TABLE persons (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     PERSONID INTEGER NOT NULL,

Modified: db/jdo/trunk/tck/src/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml (original)
+++ db/jdo/trunk/tck/src/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml Wed
Oct 13 06:43:01 2010
@@ -41,6 +41,19 @@
         </property>
     </bean>
 
+    <bean id="room1" factory-bean="companyFactory" factory-method="newMeetingRoom">
+        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Comfy Room</value></constructor-arg>
+    </bean>
+    <bean id="room2" factory-bean="companyFactory" factory-method="newMeetingRoom">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Large Discussion
Room</value></constructor-arg>
+    </bean>
+    <bean id="room3" factory-bean="companyFactory" factory-method="newMeetingRoom">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Conference
Room</value></constructor-arg>
+    </bean>
+
     <bean id="dept1" factory-bean="companyFactory" factory-method="newDepartment">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String" ><value>Development</value></constructor-arg>
@@ -58,6 +71,13 @@
                 <ref local="emp3"/>
             </set>
         </property>
+        <property name="meetingRooms">
+            <list>
+                <ref local="room1"/>
+                <ref local="room2"/>
+                <ref local="room3"/>
+            </list>
+        </property>
     </bean>
 
     <bean id="dept2" factory-bean="companyFactory" factory-method="newDepartment">
@@ -77,6 +97,10 @@
                 <ref local="emp5"/>
             </set>
         </property>
+        <property name="meetingRooms">
+            <list>
+            </list>
+        </property>
     </bean>
 
     <bean id="emp1" factory-bean="companyFactory" factory-method="newFullTimeEmployee">



Mime
View raw message