Author: lresende
Date: Thu Aug 30 11:21:17 2007
New Revision: 571265
URL: http://svn.apache.org/viewvc?rev=571265&view=rev
Log:
TUSCANY-961 - Small correction on top of last committ
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java?rev=571265&r1=571264&r2=571265&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
Thu Aug 30 11:21:17 2007
@@ -56,7 +56,6 @@
Type type = changedObject.getType();
TableWrapper tableWrapper = new TableWrapper(table);
StringBuffer statement = new StringBuffer("update ");
- //JIRA-952
if(mapping.getConfig().isDatabaseSchemaNameSupported()){
statement.append(table.getSchemaName()+"."+table.getTableName());
}
@@ -225,5 +224,4 @@
ParameterImpl param = new ParameterImpl();
return fillParameter(param, table, property, idx);
}
-
}
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java?rev=571265&r1=571264&r2=571265&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
Thu Aug 30 11:21:17 2007
@@ -37,6 +37,7 @@
import commonj.sdo.Property;
import commonj.sdo.Type;
import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.TypeHelper;
import commonj.sdo.impl.HelperProvider;
/**
@@ -54,6 +55,9 @@
private Type rootType;
private HelperContext defaultHelperContext =
HelperProvider.getDefaultContext();
+ private HelperContext helperContext =
HelperProvider.getInstance().getDefaultContext();
+ private TypeHelper typeHelper = helperContext.getTypeHelper();
+
public GraphBuilderMetadata(Collection results, Config model,
ResultSetShape shape) throws SQLException {
this.configWrapper = new MappingWrapper(model);
@@ -110,7 +114,7 @@
private void createDynamicTypes() {
- Type root = SDOUtil.createType(defaultHelperContext, getDefaultURI(),
"DataGraphRoot", false);
+ Type root = SDOUtil.createType(helperContext, getDefaultURI(),
"DataGraphRoot", false);
if (this.logger.isDebugEnabled()) {
this.logger.debug("GBMD.createDynamicTypes():created
Type for "+getDefaultURI());
}
@@ -125,7 +129,7 @@
while (names.hasNext()) {
String tableName = (String) names.next();
if (root.getProperty(tableName) == null) {
- Type tableType = SDOUtil.createType(defaultHelperContext,
getDefaultURI(), tableName, false);
+ Type tableType = SDOUtil.createType(helperContext,
getDefaultURI(), tableName, false);
Property property = SDOUtil.createProperty(root,
tableName, tableType);
SDOUtil.setMany(property, true);
SDOUtil.setContainment(property, true);
@@ -222,7 +226,7 @@
*
*/
private void createDynamicRoot() {
- Type root = SDOUtil.createType(defaultHelperContext, getDefaultURI() +
"/DataGraphRoot", "DataGraphRoot", false);
+ Type root = SDOUtil.createType(helperContext, getDefaultURI() +
"/DataGraphRoot", "DataGraphRoot", false);
List types = getDefinedTypes();
@@ -244,7 +248,7 @@
List types = null;
List defaultTypes = null;
if (this.typeURI == null) {
- types = SDOUtil.getTypes(defaultHelperContext, getDefaultURI());
+ types = SDOUtil.getTypes(helperContext, getDefaultURI());
defaultTypes = SDOUtil.getTypes(defaultHelperContext,
getDefaultURI());
if(defaultTypes != null){
if(types == null) {
@@ -257,7 +261,7 @@
return types;
}
- types = SDOUtil.getTypes(defaultHelperContext, typeURI);
+ types = SDOUtil.getTypes(helperContext, typeURI);
defaultTypes = SDOUtil.getTypes(defaultHelperContext, typeURI);
if(defaultTypes != null){
if(types == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
