You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by kw...@apache.org on 2006/06/14 23:27:20 UTC
svn commit: r414388 [2/2] - in /incubator/tuscany/java/das/rdb/src:
main/java/org/apache/tuscany/das/rdb/
main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/
main/java/org/apache/tuscany/das/rdb/impl/
test/java/org/apache/tuscany/das/rdb/test/ test...
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java Wed Jun 14 14:27:18 2006
@@ -17,7 +17,7 @@
package org.apache.tuscany.das.rdb.test;
import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.CommandGroup;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.test.data.CompanyData;
import org.apache.tuscany.das.rdb.test.data.CompanyEmpData;
import org.apache.tuscany.das.rdb.test.data.EmployeeData;
@@ -44,11 +44,11 @@
*/
public void test1() throws Exception {
- CommandGroup commandGroup = CommandGroup.FACTORY
- .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
- commandGroup.setConnection(getConnection());
+ DAS das = DAS.FACTORY
+ .createDAS(getConfig("CompanyEmployeeConfig.xml"));
+ das.setConnection(getConnection());
- Command read = commandGroup.getCommand("get companies with employee of the month");
+ Command read = das.getCommand("get companies with employee of the month");
DataObject root = read.executeQuery();
DataObject employee = root.getDataObject("COMPANY[1]/company->employee_opposite");
@@ -61,11 +61,11 @@
*/
public void test2() throws Exception {
- CommandGroup commandGroup = CommandGroup.FACTORY
- .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
- commandGroup.setConnection(getConnection());
+ DAS das = DAS.FACTORY
+ .createDAS(getConfig("CompanyEmployeeConfig.xml"));
+ das.setConnection(getConnection());
- Command read = commandGroup.getCommand("get named employee with company");
+ Command read = das.getCommand("get named employee with company");
read.setParameterValue("NAME", "Mary Smith");
DataObject root = read.executeQuery();
DataObject company = root.getDataObject("EMPLOYEE[1]/company->employee");
@@ -79,18 +79,18 @@
*/
public void test3() throws Exception {
- CommandGroup commandGroup = CommandGroup.FACTORY
- .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
- commandGroup.setConnection(getConnection());
+ DAS das = DAS.FACTORY
+ .createDAS(getConfig("CompanyEmployeeConfig.xml"));
+ das.setConnection(getConnection());
- Command read = commandGroup.getCommand("get companies with employee of the month");
+ Command read = das.getCommand("get companies with employee of the month");
DataObject root = read.executeQuery();
DataObject company = root.getDataObject("COMPANY[1]");
company.setDataObject("company->employee_opposite", null);
assertNull(company.getDataObject("company->employee_opposite"));
//Flush changes
- commandGroup.getApplyChangesCommand().execute(root);
+ das.applyChanges(root);
//Verify
root = read.executeQuery();
@@ -103,11 +103,11 @@
*/
public void test4() throws Exception {
- CommandGroup commandGroup = CommandGroup.FACTORY
- .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
- commandGroup.setConnection(getConnection());
+ DAS das = DAS.FACTORY
+ .createDAS(getConfig("CompanyEmployeeConfig.xml"));
+ das.setConnection(getConnection());
- Command read = commandGroup.getCommand("get companies with employee of the month");
+ Command read = das.getCommand("get companies with employee of the month");
DataObject root = read.executeQuery();
DataObject company = root.getDataObject("COMPANY[1]");
DataObject employee = company.getDataObject("company->employee_opposite");
@@ -115,7 +115,7 @@
assertNull(company.getDataObject("company->employee_opposite"));
//Flush changes
- commandGroup.getApplyChangesCommand().execute(root);
+ das.applyChanges(root);
//Verify
root = read.executeQuery();
@@ -128,11 +128,11 @@
*/
public void test5() throws Exception {
- CommandGroup commandGroup = CommandGroup.FACTORY
- .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
- commandGroup.setConnection(getConnection());
+ DAS das = DAS.FACTORY
+ .createDAS(getConfig("CompanyEmployeeConfig.xml"));
+ das.setConnection(getConnection());
- Command read = commandGroup.getCommand("get companies with employee of the month");
+ Command read = das.getCommand("get companies with employee of the month");
DataObject root = read.executeQuery();
DataObject company = root.getDataObject("COMPANY[1]");
@@ -146,7 +146,7 @@
company.setDataObject("company->employee_opposite", employee);
//Flush changes
- commandGroup.getApplyChangesCommand().execute(root);
+ das.applyChanges(root);
//Verify
root = read.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java Wed Jun 14 14:27:18 2006
@@ -16,8 +16,8 @@
*/
package org.apache.tuscany.das.rdb.test;
-import org.apache.tuscany.das.rdb.ApplyChangesCommand;
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.test.data.CityData;
import org.apache.tuscany.das.rdb.test.data.StateData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
@@ -48,7 +48,8 @@
}
public void testInsert() throws Exception {
- Command select = Command.FACTORY
+ DAS das = DAS.FACTORY.createDAS(getConfig("cityStates.xml"));
+ Command select = das
.createCommand(
"Select * from STATES inner join CITIES on STATES.ID = CITIES.STATE_ID",
getConfig("cityStates.xml"));
@@ -69,12 +70,8 @@
georgia.getList("cities").add(atlanta);
- // Create apply command
- ApplyChangesCommand apply = Command.FACTORY.createApplyChangesCommand(getConfig("cityStates.xml"));
- apply.setConnection(getConnection());
-
- // Flush changes
- apply.execute(root);
+ das.setConnection(getConnection());
+ das.applyChanges(root);
select.setConnection(getConnection());
root = select.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java Wed Jun 14 14:27:18 2006
@@ -20,12 +20,12 @@
import java.sql.SQLException;
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.Pager;
import org.apache.tuscany.das.rdb.impl.PagerImpl;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
-
import commonj.sdo.DataObject;
@@ -38,9 +38,9 @@
}
public void testPaging() throws SQLException {
-
+ DAS das = DAS.FACTORY.createDAS();
//Build command to read all customers
- Command custCommand = Command.FACTORY.createCommand("select * from CUSTOMER order by ID");
+ Command custCommand = das.createCommand("select * from CUSTOMER order by ID");
custCommand.setConnection(getConnection());
//Create a pager with the command
@@ -71,8 +71,9 @@
public void testRandomPage() throws SQLException {
+ DAS das = DAS.FACTORY.createDAS();
//Build the select command
- Command select = Command.FACTORY
+ Command select = das
.createCommand("select * from CUSTOMER order by ID");
//Parameterize the command
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java Wed Jun 14 14:27:18 2006
@@ -18,8 +18,8 @@
import java.sql.SQLException;
-import org.apache.tuscany.das.rdb.ApplyChangesCommand;
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
@@ -41,7 +41,8 @@
}
public void testPartialUpdate() throws SQLException {
- Command readCustomers = Command.FACTORY.createCommand("select * from CUSTOMER where ID = 1");
+ DAS das = DAS.FACTORY.createDAS();
+ Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
readCustomers.setConnection(getConnection());
// Read
@@ -51,15 +52,14 @@
// Verify
assertEquals(1, customer.getInt("ID"));
- Command update = Command.FACTORY.createCommand("update CUSTOMER set LASTNAME = 'modified' where ID = 1");
+ Command update = das.createCommand("update CUSTOMER set LASTNAME = 'modified' where ID = 1");
update.setConnection(getConnection());
update.execute();
customer.setString("ADDRESS", "main street");
- ApplyChangesCommand apply = Command.FACTORY.createApplyChangesCommand();
- apply.setConnection(getConnection());
- apply.execute(root);
+ das.setConnection(getConnection());
+ das.applyChanges(root);
root = readCustomers.executeQuery();
@@ -71,7 +71,8 @@
}
public void testPartialInsert() throws SQLException {
- Command readCustomers = Command.FACTORY.createCommand("select * from CUSTOMER where ID = 1");
+ DAS das = DAS.FACTORY.createDAS();
+ Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
readCustomers.setConnection(getConnection());
// Read
@@ -84,11 +85,10 @@
// Purposely do not set lastname to let it default to 'Garfugengheist'
// newCust.set("LASTNAME", "Gerkin" );
- ApplyChangesCommand apply = Command.FACTORY.createApplyChangesCommand();
- apply.setConnection(getConnection());
- apply.execute(root);
+ das.setConnection(getConnection());
+ das.applyChanges(root);
- Command readNewCust = Command.FACTORY.createCommand("select * from CUSTOMER where ID = 100");
+ Command readNewCust = das.createCommand("select * from CUSTOMER where ID = 100");
readNewCust.setConnection(getConnection());
root = readNewCust.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java Wed Jun 14 14:27:18 2006
@@ -23,8 +23,8 @@
*
*/
-import org.apache.tuscany.das.rdb.ApplyChangesCommand;
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
@@ -51,9 +51,9 @@
java.sql.Connection c = getConnection();
try {
-
+ DAS das = DAS.FACTORY.createDAS();
// Read customer 1
- Command select = Command.FACTORY.createCommand("Select * from CUSTOMER where ID = 1");
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
select.setConnection(c);
DataObject root = select.executeQuery();
@@ -62,12 +62,7 @@
// Modify customer
customer.set("LASTNAME", "Pavick");
- // Build apply changes command
- ApplyChangesCommand apply = Command.FACTORY.createApplyChangesCommand();
- apply.setConnection(c, false);
-
- // Flush changes
- apply.execute(root);
+ das.applyChanges(root);
// Verify changes
root = select.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java Wed Jun 14 14:27:18 2006
@@ -16,18 +16,15 @@
*/
package org.apache.tuscany.das.rdb.test;
-import java.util.Iterator;
-
-import org.apache.tuscany.das.rdb.ApplyChangesCommand;
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.test.data.BookData;
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.framework.DasTest;
import commonj.sdo.DataObject;
-import commonj.sdo.Property;
/**
* Tests the Converter framwork
@@ -50,21 +47,17 @@
* config associaed with the applychanges command
*/
public void test_1() throws Exception {
-
+ DAS das = DAS.FACTORY.createDAS();
// Read a book instance
- Command select = Command.FACTORY.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
+ Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
select.setConnection(getConnection());
DataObject root = select.executeQuery();
DataObject book = root.getDataObject("BOOK[1]");
// Change a field to mark the instance 'dirty'
- book.setInt("QUANTITY", 2);
-
- // Flush the change
- ApplyChangesCommand apply = Command.FACTORY.createApplyChangesCommand();
- apply.setConnection(getConnection());
+ book.setInt("QUANTITY", 2);
try {
- apply.execute(root);
+ das.applyChanges(root);
fail("An exception should be thrown since here is no config to identify the primary key");
} catch (RuntimeException ex) {
// Expected
@@ -76,9 +69,13 @@
* programmatically using the ConfigHelper.
*/
public void test_2() throws Exception {
-
+ // Create config programmatically
+ ConfigHelper helper = new ConfigHelper();
+ helper.addPrimaryKey("BOOK.BOOK_ID");
+ DAS das = DAS.FACTORY.createDAS(helper.getConfig());
+
// Read a book instance
- Command select = Command.FACTORY.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
+ Command select = das.createCommand("SELECT * FROM BOOK WHERE BOOK_ID = 1");
select.setConnection(getConnection());
DataObject root = select.executeQuery();
DataObject book = root.getDataObject("BOOK[1]");
@@ -86,15 +83,10 @@
book.setInt("QUANTITY", 2);
// Flush the change
- // Create config programmatically
- ConfigHelper helper = new ConfigHelper();
- helper.addPrimaryKey("BOOK.BOOK_ID");
-
- ApplyChangesCommand apply = Command.FACTORY.createApplyChangesCommand(helper.getConfig());
- apply.setConnection(getConnection());
-
- apply.execute(root);
-
+
+ das.setConnection(getConnection());
+ das.applyChanges(root);
+
// Verify
root = select.executeQuery();
book = root.getDataObject("BOOK[1]");
@@ -113,8 +105,8 @@
// Create relationship config programmatically
ConfigHelper helper = new ConfigHelper();
helper.addRelationship("CUSTOMER.ID", "ANORDER.CUSTOMER_ID");
-
- Command select = Command.FACTORY.createCommand(statement, helper.getConfig());
+ DAS das = DAS.FACTORY.createDAS(helper.getConfig());
+ Command select = das.createCommand(statement);
select.setConnection(getConnection());
DataObject root = select.executeQuery();
@@ -136,7 +128,8 @@
helper.addTable("BOOK", "Book");
helper.addPrimaryKey("Book.BOOK_ID");
- Command select = Command.FACTORY.createCommand(statement, helper.getConfig());
+ DAS das = DAS.FACTORY.createDAS(helper.getConfig());
+ Command select = das.createCommand(statement);
select.setConnection(getConnection());
select.setParameterValue("ID", new Integer(1));
@@ -146,10 +139,9 @@
newBook.setString("NAME", "Ant Colonies of the Old World");
newBook.setInt("BOOK_ID", 1001);
root.getList("Book").add(newBook);
-
- ApplyChangesCommand apply = Command.FACTORY.createApplyChangesCommand(helper.getConfig());
- apply.setConnection(getConnection());
- apply.execute(root);
+
+ das.setConnection(getConnection());
+ das.applyChanges(root);
//Verify
select.setParameterValue("ID", new Integer(1001));
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java Wed Jun 14 14:27:18 2006
@@ -23,6 +23,7 @@
*/
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
import commonj.sdo.DataObject;
@@ -42,8 +43,8 @@
public void testReadTableInfo() throws Exception {
-
- Command select = Command.FACTORY.createCommand("SELECT * from SYSIBM.SYSTABLES WHERE TYPE = 'T'");
+ DAS das = DAS.FACTORY.createDAS();
+ Command select = das.createCommand("SELECT * from SYSIBM.SYSTABLES WHERE TYPE = 'T'");
select.setConnection(getConnection());
DataObject root = select.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java Wed Jun 14 14:27:18 2006
@@ -19,6 +19,7 @@
import java.util.Iterator;
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.ResultSetShape;
import org.apache.tuscany.das.rdb.SDODataTypes;
import org.apache.tuscany.das.rdb.impl.ReadCommandImpl;
@@ -37,12 +38,13 @@
public void testReadEngineParts() throws Exception {
+ DAS das = DAS.FACTORY.createDAS(getConfig("PartsConfig.xml"));
//Table definition
//CREATE TABLE PART (ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(50), QUANTITY INT, PARENT_ID INT );
String threeLevelPartsSQL = "SELECT P1.*, P2.*, P3.* FROM PART AS P1 LEFT JOIN PART AS P2 ON P1.ID = P2.PARENT_ID "
+ "LEFT JOIN PART AS P3 on P2.ID = P3.PARENT_ID WHERE P1.ID = 1";
- Command select = Command.FACTORY.createCommand(threeLevelPartsSQL, getConfig("PartsConfig.xml"));
+ Command select = das.createCommand(threeLevelPartsSQL, getConfig("PartsConfig.xml"));
select.setConnection(getConnection());
String[] columns = {"ID", "NAME", "QUANTITY", "PARENT_ID", "ID", "NAME", "QUANTITY", "PARENT_ID", "ID", "NAME", "QUANTITY", "PARENT_ID"};
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java Wed Jun 14 14:27:18 2006
@@ -21,9 +21,8 @@
*
*/
-import org.apache.tuscany.das.rdb.ApplyChangesCommand;
import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.SDODataTypes;
+import org.apache.tuscany.das.rdb.DAS;
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.framework.DasTest;
@@ -52,8 +51,9 @@
String statement = "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID WHERE CUSTOMER.ID = 1";
+ DAS das = DAS.FACTORY.createDAS(getConfig("customerOrderRelationshipMapping.xml"));
// Read some customers and related orders
- Command select = Command.FACTORY.createCommand(statement, getConfig("customerOrderRelationshipMapping.xml"));
+ Command select = das.createCommand(statement, getConfig("customerOrderRelationshipMapping.xml"));
select.setConnection(getConnection());
DataObject root = select.executeQuery();
@@ -69,10 +69,12 @@
*/
public void testRelationshipModification2() throws Exception {
+ DAS das = DAS.FACTORY.createDAS(getConfig("basicCustomerOrderMapping.xml"));
// Read some customers and related orders
- Command select = Command.FACTORY
+ Command select = das
.createCommand(
- "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID", getConfig("basicCustomerOrderMapping.xml"));
+ "SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID",
+ getConfig("basicCustomerOrderMapping.xml"));
select.setConnection(getConnection());
DataObject root = select.executeQuery();
@@ -90,16 +92,14 @@
// Move an order to cust1 from cust2
DataObject order = (DataObject) cust2.getList("orders").get(0);
cust1.getList("orders").add(order);
-
- // Build apply changes command
- ApplyChangesCommand apply = Command.FACTORY.createApplyChangesCommand(getConfig("basicCustomerOrderMapping.xml"));
- apply.setConnection(getConnection());
+
// Flush changes
- apply.execute(root);
+ das.setConnection(getConnection());
+ das.applyChanges(root);
// verify cust1 relationship updates
- select = Command.FACTORY
+ select = das
.createCommand(
"SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = :ID",
getConfig("basicCustomerOrderMapping.xml"));
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java Wed Jun 14 14:27:18 2006
@@ -17,6 +17,7 @@
package org.apache.tuscany.das.rdb.test;
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.ResultSetShape;
import org.apache.tuscany.das.rdb.SDODataTypes;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
@@ -56,8 +57,9 @@
ResultSetShape shape = new ResultSetShape(tables, columns, types);
+ DAS das = DAS.FACTORY.createDAS(getConfig("CustomerConfigWithIDConverter.xml"));
// Create and initialize command to read customers
- Command readCustomers = Command.FACTORY.createCommand(sqlString,
+ Command readCustomers = das.createCommand(sqlString,
getConfig("CustomerConfigWithIDConverter.xml"));
// Specify result shape
readCustomers.setResultSetShape(shape);
@@ -85,8 +87,9 @@
// Using literals in the select forces invalid resultset metadata
String sqlString = "Select 99, 'Roosevelt', '1600 Pennsylvania Avenue' from customer";
+ DAS das = DAS.FACTORY.createDAS();
// Create and initialize command to read customers
- Command readCustomers = Command.FACTORY.createCommand(sqlString);
+ Command readCustomers = das.createCommand(sqlString);
readCustomers.setConnection(getConnection());
// Read
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java Wed Jun 14 14:27:18 2006
@@ -33,6 +33,7 @@
*/
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
@@ -56,7 +57,8 @@
public void testReadSingle() throws Exception {
//Create and initialize command to read customers
- Command readCustomers = Command.FACTORY.createCommand("select * from CUSTOMER where ID = 1");
+ DAS das = DAS.FACTORY.createDAS();
+ Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
readCustomers.setConnection(getConnection());
//Read
@@ -71,8 +73,9 @@
*/
public void testReadSingle2() throws Exception {
+ DAS das = DAS.FACTORY.createDAS();
//Create and initialize command to read customers
- Command readCustomers = Command.FACTORY.createCommand("select * from CUSTOMER where ID = 1");
+ Command readCustomers = das.createCommand("select * from CUSTOMER where ID = 1");
readCustomers.setConnection(getConnection());
//Read
@@ -95,9 +98,9 @@
* Same as above but tests tolerance of white space in provided SQL
*/
public void testReadSingleWithWhiteSpace() throws Exception {
-
+ DAS das = DAS.FACTORY.createDAS();
//Create and initialize command to read customers
- Command readCustomers = Command.FACTORY.createCommand(" select * from CUSTOMER where ID = 1");
+ Command readCustomers = das.createCommand(" select * from CUSTOMER where ID = 1");
readCustomers.setConnection(getConnection());
//Read
@@ -112,8 +115,9 @@
*/
public void testReadMultiple() throws Exception {
+ DAS das = DAS.FACTORY.createDAS();
//Create and initialize command to read customers
- Command readCustomers = Command.FACTORY.createCommand("select * from CUSTOMER where LASTNAME = 'Williams'");
+ Command readCustomers = das.createCommand("select * from CUSTOMER where LASTNAME = 'Williams'");
readCustomers.setConnection(getConnection());
//Read
@@ -128,9 +132,9 @@
* LASTNAME value is provided via a parameter
*/
public void testReadMultipleWithParameters() throws Exception {
-
+ DAS das = DAS.FACTORY.createDAS();
//Create and initialize command to read customers
- Command readCustomers = Command.FACTORY.createCommand("select * from CUSTOMER where LASTNAME = :LASTNAME");
+ Command readCustomers = das.createCommand("select * from CUSTOMER where LASTNAME = :LASTNAME");
readCustomers.setConnection(getConnection());
//Parameterize the command
@@ -142,13 +146,13 @@
}
public void testInsert() throws Exception {
-
- Command insert = Command.FACTORY.createCommand("insert into CUSTOMER values (10, 'Williams', '5528 Wells Fargo Dr')");
+ DAS das = DAS.FACTORY.createDAS();
+ Command insert = das.createCommand("insert into CUSTOMER values (10, 'Williams', '5528 Wells Fargo Dr')");
insert.setConnection(getConnection());
insert.execute();
//Verify
- Command select = Command.FACTORY.createCommand("Select * from CUSTOMER where ID = 10");
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
select.setConnection(getConnection());
DataObject root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
@@ -157,8 +161,8 @@
}
public void testInsertWithParameters() throws Exception {
-
- Command insert = Command.FACTORY.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
+ DAS das = DAS.FACTORY.createDAS();
+ Command insert = das.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
insert.setConnection(getConnection());
insert.setParameterValue("ID", new Integer(10));
insert.setParameterValue("LASTNAME", "Williams");
@@ -166,7 +170,7 @@
insert.execute();
//Verify
- Command select = Command.FACTORY.createCommand("Select * from CUSTOMER where ID = 10");
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 10");
select.setConnection(getConnection());
DataObject root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
@@ -176,15 +180,15 @@
public void testDelete() throws Exception {
-
+ DAS das = DAS.FACTORY.createDAS();
//Verify pre-condition
- Command select = Command.FACTORY.createCommand("Select * from CUSTOMER where ID = 1");
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
select.setConnection(getConnection());
DataObject root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
//Create and execute the delete command
- Command delete = Command.FACTORY.createCommand("delete from CUSTOMER where ID = 1");
+ Command delete = das.createCommand("delete from CUSTOMER where ID = 1");
delete.setConnection(getConnection());
delete.execute();
@@ -196,14 +200,14 @@
public void testUpdate() throws Exception {
-
+ DAS das = DAS.FACTORY.createDAS();
//Verify pre-condition
- Command select = Command.FACTORY.createCommand("Select * from CUSTOMER where ID = 1");
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
select.setConnection(getConnection());
DataObject root = select.executeQuery();
assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
- Command update = Command.FACTORY.createCommand("update CUSTOMER set LASTNAME = 'Pavick' where ID = 1");
+ Command update = das.createCommand("update CUSTOMER set LASTNAME = 'Pavick' where ID = 1");
update.setConnection(getConnection());
update.execute();
@@ -214,14 +218,14 @@
}
public void testUpdateWithParameters() throws Exception {
-
+ DAS das = DAS.FACTORY.createDAS();
//Verify pre-condition
- Command select = Command.FACTORY.createCommand("Select * from CUSTOMER where ID = 1");
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
select.setConnection(getConnection());
DataObject root = select.executeQuery();
assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
- Command update = Command.FACTORY.createCommand("update CUSTOMER set LASTNAME = :LASTNAME where ID = :ID");
+ Command update = das.createCommand("update CUSTOMER set LASTNAME = :LASTNAME where ID = :ID");
update.setConnection(getConnection());
update.setParameterValue("LASTNAME", "Pavick");
update.setParameterValue("ID", new Integer(1));
@@ -234,14 +238,14 @@
}
public void testUpdateWithParmarkers() throws Exception {
-
+ DAS das = DAS.FACTORY.createDAS();
//Verify pre-condition
- Command select = Command.FACTORY.createCommand("Select * from CUSTOMER where ID = 1");
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
select.setConnection(getConnection());
DataObject root = select.executeQuery();
assertFalse(root.get("CUSTOMER[1]/LASTNAME").equals("Pavick"));
- Command update = Command.FACTORY.createCommand("update CUSTOMER set LASTNAME = ? where ID = ?");
+ Command update = das.createCommand("update CUSTOMER set LASTNAME = ? where ID = ?");
update.setConnection(getConnection());
update.setParameterValue(1, "Pavick");
update.setParameterValue(2, new Integer(1));
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java Wed Jun 14 14:27:18 2006
@@ -18,6 +18,7 @@
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.Parameter;
import org.apache.tuscany.das.rdb.SDODataTypes;
import org.apache.tuscany.das.rdb.test.data.CompanyData;
@@ -45,8 +46,8 @@
// Call a simple stored proc to read all companies
public void testGetCompanies() throws Exception {
-
- Command read = Command.FACTORY.createCommand("{call GETALLCOMPANIES()}");
+ DAS das = DAS.FACTORY.createDAS();
+ Command read = das.createCommand("{call GETALLCOMPANIES()}");
read.setConnection(getConnection());
DataObject root = read.executeQuery();
@@ -57,8 +58,8 @@
}
public void testGetNamedCompany() throws Exception {
-
- Command read = Command.FACTORY.createCommand("{call GETNAMEDCOMPANY(?)}");
+ DAS das = DAS.FACTORY.createDAS();
+ Command read = das.createCommand("{call GETNAMEDCOMPANY(?)}");
read.setConnection(getConnection());
read.setParameterValue(1, "MegaCorp");
@@ -69,7 +70,8 @@
}
public void testGetNamedCompanyByName() throws Exception {
- Command read = Command.FACTORY
+ DAS das = DAS.FACTORY.createDAS();
+ Command read = das
.createCommand("{call GETNAMEDCOMPANY(:NAME)}");
read.setConnection(getConnection());
@@ -82,8 +84,8 @@
// Retreive heirarchy using a stored proc ... new programming model
public void testGetCustomersAndOrder() throws Exception {
-
- Command read = Command.FACTORY.createCommand("{call getCustomerAndOrders(?)}", getConfig("CustomersOrdersConfig.xml"));
+ DAS das = DAS.FACTORY.createDAS(getConfig("CustomersOrdersConfig.xml"));
+ Command read = das.createCommand("{call getCustomerAndOrders(?)}", getConfig("CustomersOrdersConfig.xml"));
read.setConnection(getConnection());
read.setParameterValue(1, new Integer(1));
@@ -103,8 +105,8 @@
* in the out parameter
*/
public void testGetNamedCustomers() throws Exception {
-
- Command read = Command.FACTORY.createCommand("{call GETNAMEDCUSTOMERS(?,?)}");
+ DAS das = DAS.FACTORY.createDAS();
+ Command read =das.createCommand("{call GETNAMEDCUSTOMERS(?,?)}");
read.setConnection(getConnection());
read.setParameterValue(1, "Williams");
read.addParameter(2, Parameter.OUT, SDODataTypes.INTEGER);
@@ -123,14 +125,14 @@
// Simplest possible SP write
public void testDelete() throws Exception {
-
- Command delete = Command.FACTORY.createCommand("{call DELETECUSTOMER(?)}");
+ DAS das = DAS.FACTORY.createDAS();
+ Command delete = das.createCommand("{call DELETECUSTOMER(?)}");
delete.setConnection(getConnection());
delete.setParameterValue(1, new Integer(1));
delete.execute();
// Verify DELETE
- Command select = Command.FACTORY.createCommand("Select * from CUSTOMER where ID = 1");
+ Command select = das.createCommand("Select * from CUSTOMER where ID = 1");
select.setConnection(getConnection());
DataObject root = select.executeQuery();
assertTrue(root.getList("CUSTOMER").isEmpty());
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java Wed Jun 14 14:27:18 2006
@@ -19,8 +19,8 @@
import java.io.IOException;
import java.sql.SQLException;
-import org.apache.tuscany.das.rdb.ApplyChangesCommand;
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.test.customer.AnOrder;
import org.apache.tuscany.das.rdb.test.customer.Customer;
import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
@@ -45,9 +45,9 @@
// Uses dynamic SDOs but user provides the model
public void testUserProvidedModelDynamic() throws SQLException, IOException {
-
+ DAS das = DAS.FACTORY.createDAS(getConfig("1xM_mapping_no_cud.xml"));
// Build the select command
- Command select = Command.FACTORY
+ Command select = das
.createCommand(
"SELECT * FROM CUSTOMER LEFT JOIN ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = :ID",
getConfig("1xM_mapping_no_cud.xml"));
@@ -73,11 +73,9 @@
AnOrder order = (AnOrder) customer.getOrders().get(0);
order.setProduct("Kitchen Sink 001");
- ApplyChangesCommand apply = Command.FACTORY.createApplyChangesCommand(getConfig("1xM_mapping_no_cud.xml"));
- apply.setConnection(getConnection());
-
// Flush changes
- apply.execute((DataObject) root);
+ das.setConnection(getConnection());
+ das.applyChanges((DataObject) root);
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java Wed Jun 14 14:27:18 2006
@@ -24,15 +24,11 @@
*
*/
-import java.sql.Timestamp;
-import java.util.Date;
-
-import org.apache.tuscany.das.rdb.ApplyChangesCommand;
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.test.data.TypesData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
-
import commonj.sdo.DataObject;
@@ -48,9 +44,9 @@
* Read various types.
*/
public void testRead() throws Exception {
-
+ DAS das = DAS.FACTORY.createDAS();
//Read customer 1
- Command select = Command.FACTORY.createCommand("Select * from TYPETEST where ID = 1");
+ Command select = das.createCommand("Select * from TYPETEST where ID = 1");
select.setConnection(getConnection());
DataObject root = select.executeQuery();
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyFactoryImpl.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyFactoryImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyFactoryImpl.java Wed Jun 14 14:27:18 2006
@@ -16,14 +16,15 @@
*/
package org.apache.tuscany.das.rdb.test.company.impl;
-import org.apache.tuscany.das.rdb.test.company.*;
-
+import org.apache.tuscany.das.rdb.test.company.CompanyFactory;
+import org.apache.tuscany.das.rdb.test.company.CompanyType;
+import org.apache.tuscany.das.rdb.test.company.DatagraphRoot;
+import org.apache.tuscany.das.rdb.test.company.DepartmentType;
+import org.apache.tuscany.das.rdb.test.company.EmployeeType;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
/**
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyPackageImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyPackageImpl.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyPackageImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyPackageImpl.java Wed Jun 14 14:27:18 2006
@@ -21,15 +21,12 @@
import org.apache.tuscany.das.rdb.test.company.DatagraphRoot;
import org.apache.tuscany.das.rdb.test.company.DepartmentType;
import org.apache.tuscany.das.rdb.test.company.EmployeeType;
-
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EFactory;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
/**
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyTypeImpl.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyTypeImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/CompanyTypeImpl.java Wed Jun 14 14:27:18 2006
@@ -21,19 +21,13 @@
import org.apache.tuscany.das.rdb.test.company.CompanyType;
import org.apache.tuscany.das.rdb.test.company.DepartmentType;
-
import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/DatagraphRootImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/DatagraphRootImpl.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/DatagraphRootImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/DatagraphRootImpl.java Wed Jun 14 14:27:18 2006
@@ -23,16 +23,11 @@
import org.apache.tuscany.das.rdb.test.company.DatagraphRoot;
import org.apache.tuscany.das.rdb.test.company.DepartmentType;
import org.apache.tuscany.das.rdb.test.company.EmployeeType;
-
import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/DepartmentTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/DepartmentTypeImpl.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/DepartmentTypeImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/DepartmentTypeImpl.java Wed Jun 14 14:27:18 2006
@@ -21,19 +21,13 @@
import org.apache.tuscany.das.rdb.test.company.DepartmentType;
import org.apache.tuscany.das.rdb.test.company.EmployeeType;
-
import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/EmployeeTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/EmployeeTypeImpl.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/EmployeeTypeImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/company/impl/EmployeeTypeImpl.java Wed Jun 14 14:27:18 2006
@@ -17,13 +17,9 @@
package org.apache.tuscany.das.rdb.test.company.impl;
import org.apache.tuscany.das.rdb.test.company.EmployeeType;
-
import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/AnOrderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/AnOrderImpl.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/AnOrderImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/AnOrderImpl.java Wed Jun 14 14:27:18 2006
@@ -17,13 +17,9 @@
package org.apache.tuscany.das.rdb.test.customer.impl;
import org.apache.tuscany.das.rdb.test.customer.AnOrder;
-
import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerFactoryImpl.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerFactoryImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerFactoryImpl.java Wed Jun 14 14:27:18 2006
@@ -16,14 +16,14 @@
*/
package org.apache.tuscany.das.rdb.test.customer.impl;
-import org.apache.tuscany.das.rdb.test.customer.*;
-
+import org.apache.tuscany.das.rdb.test.customer.AnOrder;
+import org.apache.tuscany.das.rdb.test.customer.Customer;
+import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
+import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
/**
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerImpl.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerImpl.java Wed Jun 14 14:27:18 2006
@@ -21,19 +21,13 @@
import org.apache.tuscany.das.rdb.test.customer.AnOrder;
import org.apache.tuscany.das.rdb.test.customer.Customer;
-
import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerPackageImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerPackageImpl.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerPackageImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerPackageImpl.java Wed Jun 14 14:27:18 2006
@@ -20,15 +20,12 @@
import org.apache.tuscany.das.rdb.test.customer.Customer;
import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
-
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EFactory;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
/**
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/DataGraphRootImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/DataGraphRootImpl.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/DataGraphRootImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/DataGraphRootImpl.java Wed Jun 14 14:27:18 2006
@@ -22,16 +22,11 @@
import org.apache.tuscany.das.rdb.test.customer.AnOrder;
import org.apache.tuscany.das.rdb.test.customer.Customer;
import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
-
import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java Wed Jun 14 14:27:18 2006
@@ -18,7 +18,6 @@
import java.sql.SQLException;
-
import junit.framework.Test;
public class MySQLSetup extends DatabaseSetup {
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?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- 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 Wed Jun 14 14:27:18 2006
@@ -16,8 +16,12 @@
*/
package org.apache.tuscany.das.rdb.test.suites;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.tuscany.das.rdb.test.BestPracticeTests;
import org.apache.tuscany.das.rdb.test.CUDGeneration;
+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.ConverterTests;
@@ -43,11 +47,7 @@
import org.apache.tuscany.das.rdb.test.StoredProcs;
import org.apache.tuscany.das.rdb.test.TopDown;
import org.apache.tuscany.das.rdb.test.TypeTests;
-import org.apache.tuscany.das.rdb.test.CommandGroupTests;
import org.apache.tuscany.das.rdb.test.typed.SimplestStaticCrud;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
public class AllCommonTests {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java Wed Jun 14 14:27:18 2006
@@ -16,11 +16,11 @@
*/
package org.apache.tuscany.das.rdb.test.suites;
-import org.apache.tuscany.das.rdb.test.ReadDBSchemaTests;
-import org.apache.tuscany.das.rdb.test.framework.DB2Setup;
-
import junit.framework.Test;
import junit.framework.TestSuite;
+
+import org.apache.tuscany.das.rdb.test.ReadDBSchemaTests;
+import org.apache.tuscany.das.rdb.test.framework.DB2Setup;
public class AllTestsDB2 {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java Wed Jun 14 14:27:18 2006
@@ -16,10 +16,10 @@
*/
package org.apache.tuscany.das.rdb.test.suites;
-import org.apache.tuscany.das.rdb.test.framework.DerbySetup;
-
import junit.framework.Test;
import junit.framework.TestSuite;
+
+import org.apache.tuscany.das.rdb.test.framework.DerbySetup;
public class AllTestsDerby extends TestSuite {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java Wed Jun 14 14:27:18 2006
@@ -16,10 +16,10 @@
*/
package org.apache.tuscany.das.rdb.test.suites;
-import org.apache.tuscany.das.rdb.test.framework.MySQLSetup;
-
import junit.framework.Test;
import junit.framework.TestSuite;
+
+import org.apache.tuscany.das.rdb.test.framework.MySQLSetup;
public class AllTestsMySQL {
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java Wed Jun 14 14:27:18 2006
@@ -20,6 +20,7 @@
import java.util.Collection;
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
@@ -39,9 +40,11 @@
}
public void testRead() throws Exception {
- SDOUtil.registerStaticTypes(CustomerFactory.class);
InputStream mapping = getClass().getClassLoader().getResourceAsStream("basicStaticCustomer.xml");
- Command select = Command.FACTORY.createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where LASTNAME = :LASTNAME",mapping);
+ DAS das = DAS.FACTORY.createDAS(mapping);
+ SDOUtil.registerStaticTypes(CustomerFactory.class);
+
+ Command select = das.createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where LASTNAME = :LASTNAME");
select.setConnection(getConnection());
select.setParameterValue("LASTNAME", "Williams");
TypeHelper helper = TypeHelper.INSTANCE;
Modified: incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml?rev=414388&r1=414387&r2=414388&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml Wed Jun 14 14:27:18 2006
@@ -21,6 +21,9 @@
<Column columnName="PRODUCTID" primaryKey="true"/>
</Table>
+ <Table tableName="ANORDER">
+ <Column columnName="ID" primaryKey="true"/>
+ </Table>
<Relationship name="ORDERDETAILS" primaryKeyTable="ANORDER"
foreignKeyTable="ORDERDETAILS" many="true">
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org