You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/03/24 17:07:13 UTC
svn commit: r522046 - in /incubator/tuscany/java/das/rdb/src:
main/java/org/apache/tuscany/das/rdb/
main/java/org/apache/tuscany/das/rdb/config/wrapper/
test/java/org/apache/tuscany/das/rdb/test/
test/java/org/apache/tuscany/das/rdb/test/data/ test/jav...
Author: lresende
Date: Sat Mar 24 09:07:12 2007
New Revision: 522046
URL: http://svn.apache.org/viewvc?view=rev&rev=522046
Log:
Applying Amita's patch for TUSCANY-841.
Added:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java?view=diff&rev=522046&r1=522045&r2=522046
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java Sat Mar 24 09:07:12 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.das.rdb;
+import java.util.Vector;
+
import org.apache.tuscany.das.rdb.config.Column;
import org.apache.tuscany.das.rdb.config.Command;
import org.apache.tuscany.das.rdb.config.Config;
@@ -56,6 +58,10 @@
public Relationship addRelationship(String parentName, String childName) {
return configWrapper.addRelationship(parentName, childName);
+ }
+
+ public Relationship addRelationship(Vector parentNames, Vector childNames) {
+ return configWrapper.addRelationship(parentNames, childNames);
}
public Table addTable(String name, String typeName) {
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java?view=diff&rev=522046&r1=522045&r2=522046
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java Sat Mar 24 09:07:12 2007
@@ -25,6 +25,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Vector;
import org.apache.log4j.Logger;
import org.apache.tuscany.das.rdb.config.Column;
@@ -160,7 +161,72 @@
return r;
}
+
+ public Relationship addRelationship(Vector parentNames, Vector childNames) {
+ //create vector for each
+ if(parentNames.size() != childNames.size()){
+ throw new RuntimeException("Can not for relationship for multiple keys, different sizes");
+ }
+
+ Vector parentColumns = new Vector();
+ Vector childColumns = new Vector();
+
+ for(int i=0; i<parentNames.size(); i++){
+ QualifiedColumn parent = new QualifiedColumn((String)parentNames.get(i));
+ QualifiedColumn child = new QualifiedColumn((String)childNames.get(i));
+
+ parentColumns.add(parent);
+ childColumns.add(child);
+ }
+
+ //all parent columns should be from same table and schema
+ //all child columns should be from same table and schema
+ checkTableNames(parentColumns);
+ //checkSchemaNames(parentColumns);
+
+ checkTableNames(childColumns);
+ //checkSchemaNames(childColumns);
+
+ Relationship r = FACTORY.createRelationship();
+
+ r.setName(((QualifiedColumn)childColumns.get(0)).getTableName());
+ r.setPrimaryKeyTable(((QualifiedColumn)parentColumns.get(0)).getTableName());
+ r.setForeignKeyTable(((QualifiedColumn)childColumns.get(0)).getTableName());
+
+
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("Created relationship from " + r.getPrimaryKeyTable()
+ + " to " + r.getForeignKeyTable() + " named " + r.getName());
+ }
+ KeyPair pair = null;
+
+ for(int i=0; i<parentColumns.size(); i++){
+ pair = FACTORY.createKeyPair();
+ pair.setPrimaryKeyColumn(((QualifiedColumn)parentColumns.get(i)).getColumnName());
+ pair.setForeignKeyColumn(((QualifiedColumn)childColumns.get(i)).getColumnName());
+ r.getKeyPair().add(pair);
+ }
+
+ r.setMany(true);
+ config.getRelationship().add(r);
+
+ return r;
+ }
+
+ public void checkTableNames(Vector columns){
+ String expectedTableName = ((QualifiedColumn)columns.get(0)).getTableName();
+
+ for(int i=0; i<columns.size(); i++){
+ QualifiedColumn currColumn = (QualifiedColumn)columns.get(i);
+ String currTableName = currColumn.getTableName();
+
+ if(!currTableName.equals(expectedTableName)){
+ throw new RuntimeException("Columns in one side of relationship can not be from different tables");
+ }
+ }
+ }
+
public void addPrimaryKey(String columnName) {
addPrimaryKey(Collections.singletonList(columnName));
}
Added: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java?view=auto&rev=522046
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java (added)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java Sat Mar 24 09:07:12 2007
@@ -0,0 +1,271 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.das.rdb.test;
+
+/*
+ *
+ *
+ */
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Vector;
+
+import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
+import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.config.Relationship;
+//import org.apache.tuscany.das.rdb.test.data.CustomerData;
+//import org.apache.tuscany.das.rdb.test.data.OrderData;
+import org.apache.tuscany.das.rdb.test.data.OrderDetailsData;
+import org.apache.tuscany.das.rdb.test.data.OrderDetailsDescriptionData;
+//import org.apache.tuscany.das.rdb.test.data.ProductData;
+import org.apache.tuscany.das.rdb.test.framework.DasTest;
+
+import commonj.sdo.DataObject;
+
+import org.apache.tuscany.sdo.helper.*;//JIRA-841
+
+public class CompoundKeyRelationshipTests extends DasTest {
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ //new OrderData(getAutoConnection()).refresh();
+ //new ProductData(getAutoConnection()).refresh();
+ new OrderDetailsData(getAutoConnection()).refresh();
+ new OrderDetailsDescriptionData(getAutoConnection()).refresh();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ /**
+ * Test ability to read a compound graph
+ */
+ public void testRead() throws Exception {
+
+ String statement = "SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC "
+ + "ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID AND " +
+ " ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID " +
+ " WHERE ORDERDETAILS.ORDERID = 1 AND ORDERDETAILS.PRODUCTID = 1";
+
+ DAS das = DAS.FACTORY.createDAS(getConfig("OrderDetailsAndDescription.xml"), getConnection());
+ // Read some order details and related order details description
+ Command select = das.createCommand(statement);
+
+ DataObject root = select.executeQuery();
+ DataObject orderdetails = root.getDataObject("ORDERDETAILS[1]");
+
+ assertEquals(2, orderdetails.getList("orderDetailsDesc").size());
+ }
+
+ /**
+ * Same as above except uses xml file for relationhip and key information.
+ * Employs CUD generation.
+ */
+ public void testRelationshipModification2() throws Exception {
+ DAS das = DAS.FACTORY.createDAS(getConfig("OrderDetailsAndDescription.xml"), getConnection());
+ // Read some order details and related order details descs
+ Command select = das
+ .createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+ " AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+ DataObject root = select.executeQuery();
+
+ DataObject ordDet1 = root.getDataObject("ORDERDETAILS[1]");
+ DataObject ordDet2 = root.getDataObject("ORDERDETAILS[2]");
+
+ // Save IDs
+ Integer ord1ID = (Integer) ordDet1.get("ORDERID");
+ Integer prod1ID = (Integer) ordDet1.get("PRODUCTID");
+
+ Integer ord2ID = (Integer) ordDet2.get("ORDERID");
+ Integer prod2ID = (Integer) ordDet2.get("PRODUCTID");
+
+ // save order count
+ Integer order1DetDescCount = Integer.valueOf(ordDet1.getList("orderDetailsDesc").size());
+ Integer order2DetDescCount = Integer.valueOf(ordDet2.getList("orderDetailsDesc").size());
+
+ // Move an order detail desc to ord det1 from ord det2
+ DataObject orderDetailsDesc = (DataObject) ordDet2.getList("orderDetailsDesc").get(0);
+ ordDet1.getList("orderDetailsDesc").add(orderDetailsDesc);
+
+ // Flush changes
+ das.applyChanges(root);
+
+ // verify ord det1 relationship updates
+ select = das
+ .createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+ " AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID where ORDERDETAILS.ORDERID = ? AND ORDERDETAILS.PRODUCTID = ?");
+ select.setParameter(1, ord1ID);
+ select.setParameter(2, prod1ID);
+
+ root = select.executeQuery();
+ assertEquals(order1DetDescCount.intValue() + 1, root.getList("ORDERDETAILS[1]/orderDetailsDesc").size());
+
+ // verify ord det2 relationship updates
+ select.setParameter(1, ord2ID);
+ select.setParameter(2, prod2ID);
+
+ root = select.executeQuery();
+ assertEquals(order2DetDescCount.intValue() - 1, root.getList("ORDERDETAILS[1]/orderDetailsDesc").size());
+ }
+
+ public void testFKBehavior() throws SQLException {
+ DAS das = DAS.FACTORY.createDAS(getConfig("OrderDetailsAndDescription.xml"), getConnection());
+ // Read some order details and related order details descs
+ Command select = das
+ .createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+ " AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+ DataObject root = select.executeQuery();
+
+ DataObject ordDet1 = root.getDataObject("ORDERDETAILS[1]");
+ DataObject ordDet2 = root.getDataObject("ORDERDETAILS[2]");
+
+ // Save IDs
+ Integer ord1ID = (Integer) ordDet1.get("ORDERID");
+ Integer prod1ID = (Integer) ordDet1.get("PRODUCTID");
+
+ // Move an order det desc to ord det1 from ord det2
+ DataObject orderDetDesc = (DataObject) ordDet2.getList("orderDetailsDesc").get(0);
+ ordDet1.getList("orderDetailsDesc").add(orderDetDesc);
+ orderDetDesc.setInt("ORDERID", ord1ID);
+
+ try {
+ das.applyChanges(root);
+ fail("An exception should be thrown");
+ } catch (RuntimeException ex) {
+ assertEquals("Foreign key properties should not be set when the corresponding relationship has changed", ex.getMessage());
+ }
+
+ }
+
+ public void testFKBehavior2() throws SQLException {
+ DAS das = DAS.FACTORY.createDAS(getConfig("OrderDetailsAndDescription.xml"), getConnection());
+ // Read some order details and related order details descs
+ Command select = das
+ .createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+ " AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+ DataObject root = select.executeQuery();
+
+ DataObject ordDet1 = root.getDataObject("ORDERDETAILS[1]");
+ DataObject ordDet2 = root.getDataObject("ORDERDETAILS[2]");
+
+ // Save IDs
+ Integer ord1ID = (Integer) ordDet1.get("ORDERID");
+ Integer prod1ID = (Integer) ordDet1.get("PRODUCTID");
+
+ // Create an order det desc for ord det1
+ DataObject orderDetDesc = root.createDataObject("ORDERDETAILSDESC");
+ orderDetDesc.setInt("ID", 500);
+ orderDetDesc.setInt("ORDERID", ord1ID);
+ ordDet1.getList("orderDetailsDesc").add(orderDetDesc);
+
+ try {
+ das.applyChanges(root);
+ fail("An exception should be thrown");
+ } catch (RuntimeException ex) {
+ assertEquals("Foreign key properties should not be set when the corresponding relationship has changed", ex.getMessage());
+ }
+ }
+
+ //add relationship through config helper
+ public void testValidFKColumn() throws SQLException {
+ ConfigHelper helper = new ConfigHelper();
+ Vector parentColumnNames = new Vector();
+ Vector childColumnNames = new Vector();
+
+ parentColumnNames.add(0, "ORDERDETAILS.ORDERID");
+ parentColumnNames.add(1, "ORDERDETAILS.PRODUCTID");
+
+ childColumnNames.add(0, "ORDERDETAILSDESC.ORDERID");
+ childColumnNames.add(1, "ORDERDETAILSDESC.PRODUCTID");
+
+ Relationship r = helper.addRelationship(parentColumnNames, childColumnNames);
+
+ DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+ Command select = das.createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+ " AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+ DataObject root = select.executeQuery();
+ DataObject ordDet1 = root.getDataObject("ORDERDETAILS[1]");
+ int order1DetDescCount = ordDet1.getList("ORDERDETAILSDESC").size();
+
+ DataObject orderDetDesc = root.createDataObject("ORDERDETAILSDESC");
+ orderDetDesc.setInt("ID", 500);
+
+ if(ordDet1 == null) System.out.println("order det1 is null");
+ if(ordDet1.getList("ORDERDETAILSDESC") == null)System.out.println("list is null");
+
+ ordDet1.getList("ORDERDETAILSDESC").add(orderDetDesc);
+ try {
+ das.applyChanges(root);
+
+ select = das.createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+ " AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+ int modOrder1DetDescCount = select.executeQuery().
+ getDataObject("ORDERDETAILS[1]").getList("ORDERDETAILSDESC").size();
+ this.assertEquals(modOrder1DetDescCount, order1DetDescCount+1);
+ } catch (RuntimeException ex) {
+ fail("Exception was not expected:DETAILS:"+ ex.getMessage());
+ }
+ }
+
+ //add invalid relationship through config helper using invalid FK column name
+ public void testInvalidFKColumn() throws SQLException {
+ ConfigHelper helper = new ConfigHelper();
+ Vector parentColumnNames = new Vector();
+ Vector childColumnNames = new Vector();
+
+ parentColumnNames.add(0, "ORDERDETAILS.ORDERID");
+ parentColumnNames.add(1, "ORDERDETAILS.PRODUCTID");
+
+ childColumnNames.add(0, "ORDERDETAILSDESC.ORDERID_INVALID");
+ childColumnNames.add(1, "ORDERDETAILSDESC.PRODUCTID");
+
+ Relationship r = helper.addRelationship(parentColumnNames, childColumnNames);
+
+ DAS das = DAS.FACTORY.createDAS(helper.getConfig(), getConnection());
+ Command select = das.createCommand("SELECT * FROM ORDERDETAILS LEFT JOIN ORDERDETAILSDESC ON ORDERDETAILS.ORDERID = ORDERDETAILSDESC.ORDERID " +
+ " AND ORDERDETAILS.PRODUCTID = ORDERDETAILSDESC.PRODUCTID");
+
+ DataObject root = select.executeQuery();
+ DataObject ordDet1 = root.getDataObject("ORDERDETAILS[1]");
+ int order1DetDescCount = ordDet1.getList("ORDERDETAILSDESC").size();
+
+ DataObject orderDetDesc = root.createDataObject("ORDERDETAILSDESC");
+ orderDetDesc.setInt("ID", 500);
+
+ if(ordDet1 == null) System.out.println("order det1 is null");
+ if(ordDet1.getList("ORDERDETAILSDESC") == null)System.out.println("list is null");
+
+ ordDet1.getList("ORDERDETAILSDESC").add(orderDetDesc);
+ try {
+ das.applyChanges(root);
+ fail("Exception was expected");
+ } catch (RuntimeException ex) {
+ assertEquals("Invalid foreign key column: ORDERID_INVALID", ex.getMessage());
+ }
+ }
+}
Added: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java?view=auto&rev=522046
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java (added)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java Sat Mar 24 09:07:12 2007
@@ -0,0 +1,47 @@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.das.rdb.test.data;
+
+import java.sql.Connection;
+
+import org.apache.tuscany.das.rdb.test.framework.TestData;
+//JIRA-841
+public class OrderDetailsDescriptionData extends TestData {
+
+ // CREATE TABLE ORDERDETAILSDESC (ID INT NOT NULL, ORDERID INT NOT NULL, PRODUCTID INT NOT NULL,
+ // DESCR VARCHAR,
+ // PRIMARY KEY ID, FOREIGN KEY (ORDERID, PRODUCTID))
+
+ protected static Object[][] orderDetailsDescriptionData =
+ { {Integer.valueOf(1), Integer.valueOf(1), Integer.valueOf(1), "Descr 1,1,1"},
+ {Integer.valueOf(2), Integer.valueOf(1), Integer.valueOf(1), "Descr 2,1,1"},
+ {Integer.valueOf(3), Integer.valueOf(1), Integer.valueOf(2), "Descr 3,1,2"},
+ {Integer.valueOf(4), Integer.valueOf(1), Integer.valueOf(2), "Descr 4,1,2"},
+ {Integer.valueOf(5), Integer.valueOf(2), Integer.valueOf(1), "Descr 6,2,1"},
+ {Integer.valueOf(6), Integer.valueOf(2), Integer.valueOf(2), "Descr 6,2,2"}};
+
+ public OrderDetailsDescriptionData(Connection c) {
+ super(c, orderDetailsDescriptionData);
+ }
+
+ public String getTableName() {
+ return "ORDERDETAILSDESC";
+ }
+}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java?view=diff&rev=522046&r1=522045&r2=522046
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java Sat Mar 24 09:07:12 2007
@@ -127,15 +127,14 @@
private void dropTables() {
- // System.out.println("Dropping tables");
-
String[] statements = {
"DROP TABLE CUSTOMER", "DROP TABLE ANORDER", "DROP TABLE ORDERDETAILS",
- "DROP TABLE ITEM", "DROP TABLE COMPANY", "DROP TABLE EMPLOYEE",
- "DROP TABLE DEPARTMENT", "DROP TABLE BOOK", "DROP TABLE PART",
- "DROP TABLE TYPETEST", "DROP TABLE CITIES", "DROP TABLE STATES",
- "DROP TABLE conmgt.SERVERSTATUS", "DROP TABLE DOG", "DROP TABLE OWNER",
- "DROP TABLE KENNEL", "DROP TABLE VISIT"
+ "DROP TABLE ORDERDETAILSDESC", "DROP TABLE ITEM", "DROP TABLE COMPANY",
+ "DROP TABLE EMPLOYEE", "DROP TABLE DEPARTMENT", "DROP TABLE BOOK",
+ "DROP TABLE PART", "DROP TABLE TYPETEST", "DROP TABLE CITIES",
+ "DROP TABLE STATES", "DROP TABLE conmgt.SERVERSTATUS",
+ "DROP TABLE DOG", "DROP TABLE OWNER", "DROP TABLE KENNEL",
+ "DROP TABLE VISIT"
};
for (int i = 0; i < statements.length; i++) {
@@ -215,6 +214,7 @@
s.execute(getCreateOwner());
s.execute(getCreateKennel());
s.execute(getCreateVisit());
+ s.execute(getCreateOrderDetailsDesc());//JIRA-841
} catch (SQLException e) {
throw new RuntimeException(e);
@@ -368,6 +368,11 @@
+ "PRIMARY KEY(ID))";
}
+ protected String getCreateOrderDetailsDesc() {
+ return "CREATE TABLE ORDERDETAILSDESC ("+ getIntegerColumn("ID") + " NOT NULL, " + getIntegerColumn("ORDERID") + " NOT NULL, "
+ + getIntegerColumn("PRODUCTID")
+ + " NOT NULL,"+ getStringColumn("DESCR", 20)+", PRIMARY KEY (ID))";
+ }
// /////////////////
protected String getForeignKeyConstraint(String pkTable, String pkColumn, String foreignKey) {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java?view=diff&rev=522046&r1=522045&r2=522046
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java Sat Mar 24 09:07:12 2007
@@ -27,6 +27,7 @@
import org.apache.tuscany.das.rdb.test.CommandGroupTests;
import org.apache.tuscany.das.rdb.test.CompanyTests;
import org.apache.tuscany.das.rdb.test.CompoundKeyTests;
+import org.apache.tuscany.das.rdb.test.CompoundKeyRelationshipTests;
import org.apache.tuscany.das.rdb.test.ConverterTests;
import org.apache.tuscany.das.rdb.test.CorrectedDefectTests;
import org.apache.tuscany.das.rdb.test.CrudWithChangeHistory;
@@ -77,6 +78,7 @@
suite.addTest(new TestSuite(GraphMergeTests.class));
suite.addTest(new TestSuite(CompoundKeyTests.class));
+ suite.addTest(new TestSuite(CompoundKeyRelationshipTests.class));
suite.addTest(new TestSuite(RelationshipTests.class));
suite.addTest(new TestSuite(GeneratedCommandTests.class));
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org