Author: kwilliams
Date: Wed Apr 12 13:35:31 2006
New Revision: 393599
URL: http://svn.apache.org/viewcvs?rev=393599&view=rev
Log:
Applying Brent's patch to clean up TODOs
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java?rev=393599&r1=393598&r2=393599&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
Wed Apr 12 13:35:31 2006
@@ -114,9 +114,8 @@
DataObject order = (DataObject) customer.get("orders[1]");
order.setString("PRODUCT", "Kitchen Sink 001");
- ApplyChangesCommand apply =
Command.FACTORY.createApplyChangesCommand();
- apply.setConnection(getConnection());
- apply.setMapping(getConfig("1xM_mapping_no_cud.xml"));
+ ApplyChangesCommand apply =
Command.FACTORY.createApplyChangesCommand(getConfig("1xM_mapping_no_cud.xml"));
+ apply.setConnection(getConnection());
// Flush changes
apply.execute(root);
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java?rev=393599&r1=393598&r2=393599&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
Wed Apr 12 13:35:31 2006
@@ -92,9 +92,7 @@
Key pk = new Key("ANORDER.ID");
read.addPrimaryKey(pk);
-
-
- //TODO - When this is omitted, we fail with NPE. Need a better error
message
+
Key detailsPk = new Key(new String[] { "ORDERDETAILS.ORDERID",
"ORDERDETAILS.PRODUCTID" });
read.addPrimaryKey(detailsPk);
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java?rev=393599&r1=393598&r2=393599&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 Apr 12 13:35:31 2006
@@ -73,67 +73,13 @@
AnOrder order = (AnOrder) customer.getOrders().get(0);
order.setProduct("Kitchen Sink 001");
- ApplyChangesCommand apply =
Command.FACTORY.createApplyChangesCommand();
- apply.setConnection(getConnection());
- apply.setMapping(getConfig("1xM_mapping_no_cud.xml"));
+ ApplyChangesCommand apply =
Command.FACTORY.createApplyChangesCommand(getConfig("1xM_mapping_no_cud.xml"));
+ apply.setConnection(getConnection());
// Flush changes
apply.execute((DataObject) root);
- /*
- * JDBCDAS das = JDBCDAS.FACTORY.create(); // Build the select
command
- * CrudCommand select = CrudCommand.FACTORY.create( "select
CUSTOMER.ID,
- * CUSTOMER.LASTNAME, CUSTOMER.ADDRESS, ANORDER.ID,
ANORDER.PRODUCT,
- * ANORDER.QUANTITY, ANORDER.CUSTOMER_ID from CUSTOMER left
outer join
- * ANORDER on ANORDER.CUSTOMER_ID=CUSTOMER.ID where CUSTOMER.ID
= :ID" ,
- * getMappingModel_1xM_uni_as_stream() , getGraphType()); //
- * Parameterize the command
select.setConnection(getConnection());
- * select.setParameter("ID", new Integer(1)); // Get the graph
- * DataObject root = das.getRootDataObject(select); // Modify a
customer
- * DataObject customer = (DataObject)
root.getList("CUSTOMER").get(0);
- * customer.set("LASTNAME", "Pavick"); // Modify the first order
- * DataObject order =
(DataObject)customer.getList("orders").get(0);
- * order.setString("PRODUCT", "Kitchen Sink 001"); // Build
command for
- * flush ApplyChangesCommand command =
- *
ApplyChangesCommand.FACTORY.create(getMappingModel_1xM_uni_as_stream());
- * command.setConnection(getConnection()); // Flush changes
- * das.applyChanges(root, command);
- */
}
- /*
- * //User provides the model and uses generated classes public void
- * testUserProvidedModelStatic() throws SQLException, IOException {
- *
- * JDBCDAS das = JDBCDAS.FACTORY.create();
- *
- * //Build the select command CrudCommand select =
- * CrudCommand.FACTORY.create( "select CUSTOMER.ID, CUSTOMER.LASTNAME,
- * CUSTOMER.ADDRESS, ANORDER.ID, ANORDER.PRODUCT, ANORDER.QUANTITY,
- * ANORDER.CUSTOMER_ID from CUSTOMER left outer join ANORDER on
- * ANORDER.CUSTOMER_ID=CUSTOMER.ID where CUSTOMER.ID = :ID" ,
- * getMappingModel_1xM_uni_as_stream() , getGraphType());
- *
- * //Parameterize the command select.setConnection(getConnection());
- * select.setParameter("ID", new Integer(1));
- *
- * //Get the graph DataObject root =
das.getRootDataObject(getGraphType(),
- * select);
- *
- * //Modify a customer DataGraphRoot dgRoot = (DataGraphRoot) root; //
TODO
- * Need to cast to Static customer and use "setLastName()"
- *
- * Customer customer = (Customer) dgRoot.getCustomers().get(0);
- * customer.setLastName("Pavick");
- *
- * //Modify the first order AnOrder order = customer.getOrders();
- * order.setProduct("Kitchen Sink 001");
- *
- * //Build command for flush ApplyChangesCommand command =
- *
ApplyChangesCommand.FACTORY.create(getMappingModel_1xM_uni_as_stream());
- * command.setConnection(getConnection());
- *
- * //Flush changes das.applyChanges(root, command); }
- */
}
