Author: kwilliams
Date: Wed May 10 00:31:48 2006
New Revision: 405663
URL: http://svn.apache.org/viewcvs?rev=405663&view=rev
Log:
Fix for TUSCANY-342 - changing Command hierarchy to work with Datasource
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java?rev=405663&r1=405662&r2=405663&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
Wed May 10 00:31:48 2006
@@ -46,7 +46,12 @@
if (config.getConnectionProperties() != null)
setConnection(config.getConnectionProperties());
}
-
+
+ public ApplyChangesCommandImpl(Config config, Connection connection){
+ this.configWrapper = new MappingWrapper(config);
+ setConnection(connection);
+ }
+
public void setConnection(ConnectionImpl connection) {
summarizer.setConnection(connection);
}
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java?rev=405663&r1=405662&r2=405663&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java
Wed May 10 00:31:48 2006
@@ -63,7 +63,11 @@
.next();
String kind = commandConfig.getKind();
if (kind.equalsIgnoreCase("select"))
- commands.put(commandConfig.getName(), new
ReadCommandImpl(commandConfig.getSQL(), config));
+ //TODO - Need to refactor Command heirarchy based on Datasource
+ if (config.getConnectionProperties() != null)
+ commands.put(commandConfig.getName(), new
ReadCommandImpl(commandConfig.getSQL(), config, getConnection()));
+ else
+ commands.put(commandConfig.getName(), new
ReadCommandImpl(commandConfig.getSQL(), config));
else if (kind.equalsIgnoreCase("update"))
commands.put(commandConfig.getName(), new
UpdateCommandImpl(commandConfig.getSQL()));
else if (kind.equalsIgnoreCase("insert"))
@@ -83,8 +87,7 @@
* @see org.apache.tuscany.das.rdb.CommandGroup#getApplyChangesCommand()
*/
public ApplyChangesCommand getApplyChangesCommand() {
- ApplyChangesCommand cmd = new ApplyChangesCommandImpl(config);
- cmd.setConnection(getConnection());
+ ApplyChangesCommand cmd = new ApplyChangesCommandImpl(config,
connection);
return cmd;
}
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java?rev=405663&r1=405662&r2=405663&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
Wed May 10 00:31:48 2006
@@ -53,6 +53,14 @@
setMappingModel(mapping);
}
+ //TODO - Need to refactor based on use of DataSource and CommandGroup
+ public ReadCommandImpl(String sqlString, Config mapping, Connection
connection) {
+ this(sqlString);
+ setConnection(connection);
+ if (mapping != null)
+ setMappingModel(mapping);
+ }
+
public void execute() {
throw new UnsupportedOperationException();
}
@@ -90,11 +98,11 @@
resultSetShape);
// Create the DataGraph
- DataGraph g = SDOUtil.createDataGraph();
+ DataGraph g = SDOUtil.createDataGraph();
// Create the root object
g.createRootObject(gbmd.getSchema());
-
+
ChangeSummary summary = g.getChangeSummary();
ResultSetProcessor rsp = new ResultSetProcessor(g.getRootObject(),
gbmd);
@@ -124,12 +132,13 @@
protected void setEndRow(int endRow) {
this.endRow = endRow;
}
-
private void setMappingModel(Config config) {
configWrapper = new MappingWrapper(config);
- if (config.getConnectionProperties() != null)
- setConnection(config.getConnectionProperties());
+ //TODO - need to refactor and take into regression that lost ability
to use Datasource
+ if (getConnection() == null)
+ if (config.getConnectionProperties() != null)
+ setConnection(config.getConnectionProperties());
}
public void setConnection(ConnectionProperties c) {
