antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

Did some fixes in setConstraint() which now checks if the backward

Browse source 
mapping is a primitive mapping or an object reference.
Also allow the method to be called for group-by collections, which
is why the new code should be regarded as experimental.

Removed some dead code.
This commit is contained in:
hns 2002-05-14 16:37:14 +00:00
parent d269727524
commit 1cd27f8c1d
1 changed files with 15 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/helma/objectmodel/db/Relation.java
View file

@ -153,10 +153,6 @@ public class Relation {
constraints = new Constraint[cnst.size()]; constraints = new Constraint[cnst.size()];
cnst.copyInto (constraints); cnst.copyInto (constraints);
// System.err.println ("PARSED RELATION "+this);
// if (accessor != null)
// System.err.println ("SET ACCESSOR: "+accessor);
} }
} }
@ -401,25 +397,6 @@ public class Relation {
cnst.addElement (new Constraint (local, otherType.getTableName (), foreign, false)); cnst.addElement (new Constraint (local, otherType.getTableName (), foreign, false));
columnName = local; columnName = local;
} }
/* if ("_properties".equalsIgnoreCase (propName) || virtual) {
String subnodes2props = props.getProperty (propName+".aresubnodes");
subnodesAreProperties = "true".equalsIgnoreCase (subnodes2props);
if (virtual) {
String subnodefilter = props.getProperty (propName+".subnoderelation");
if (subnodefilter != null) {
Constraint c = null; // parseConstraint_v1 (subnodefilter);
if (c != null) {
cnst.add (c);
}
}
}
// update virtual mapping, if it already exists
if (virtualMapping != null) {
virtualMapping.subnodesRel = getVirtualSubnodeRelation ();
virtualMapping.propertiesRel = getVirtualPropertyRelation ();
virtualMapping.lastTypeChange = ownType.lastTypeChange;
}
} */
} }
@ -674,24 +651,29 @@ public class Relation {
for (int i=0; i<constraints.length; i++) { for (int i=0; i<constraints.length; i++) {
// don't set groupby constraints since we don't know if the // don't set groupby constraints since we don't know if the
// parent node is the base node or a group node // parent node is the base node or a group node
if (constraints[i].isGroupby) // if (constraints[i].isGroupby)
continue; // continue;
Relation crel = otherType.columnNameToRelation (constraints[i].foreignName); Relation crel = otherType.columnNameToRelation (constraints[i].foreignName);
if (crel != null) { if (crel != null) {
// INode home = constraints[i].isGroupby ? parent : nonVirtual; // INode home = constraints[i].isGroupby ? parent : nonVirtual;
String localName = constraints[i].localName; String localName = constraints[i].localName;
if (localName == null || localName.equalsIgnoreCase (ownType.getIDField ())) { if (localName == null || localName.equalsIgnoreCase (ownType.getIDField ())) {
INode currentValue = child.getNode (crel.propName, false); // only set node if property in child object is defined as reference.
// we set the backwards reference iff the reference is currently unset, if if (crel.reftype == REFERENCE) {
// is set to a transient object, or if the new target is not transient. This INode currentValue = child.getNode (crel.propName, false);
// prevents us from overwriting a persistent refererence with a transient one, // we set the backwards reference iff the reference is currently unset, if
// which would most probably not be what we want. // is set to a transient object, or if the new target is not transient. This
if (currentValue == null || // prevents us from overwriting a persistent refererence with a transient one,
// which would most probably not be what we want.
if (currentValue == null ||
(currentValue != home && (currentValue != home &&
(currentValue.getState() == Node.TRANSIENT || (currentValue.getState() == Node.TRANSIENT ||
home.getState() != Node.TRANSIENT))) home.getState() != Node.TRANSIENT)))
child.setNode (crel.propName, home); child.setNode (crel.propName, home);
} else { } else if (crel.reftype == PRIMITIVE) {
child.setString (crel.propName, home.getID ());
}
} else if (crel.reftype == PRIMITIVE) {
String value = null; String value = null;
if (ownType.isRelational ()) if (ownType.isRelational ())
value = home.getString (ownType.columnNameToProperty (localName), false); value = home.getString (ownType.columnNameToProperty (localName), false);