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

Re-add check if Relation is PRIMITIVE or REFERENCE when creating properties in createNode

Browse source 
(was removed yesterday, not sure it's really needed)
Remove code that was commented out and isn't coming back
This commit is contained in:
hns 2003-11-19 15:09:54 +00:00
parent 615c9c65d1
commit a8da2b48bd
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/helma/objectmodel/db/NodeManager.java
View file

@ -1702,14 +1702,6 @@ public final class NodeManager {
name = rs.getString(i+1+offset);
}
// Relation rel = columns[i].getRelation();
/* if ((rel == null) ||
((rel.reftype != Relation.PRIMITIVE) &&
(rel.reftype != Relation.REFERENCE))) {
continue;
} */
Property newprop = new Property(node);
switch (columns[i].getType()) {
@ -1824,12 +1816,6 @@ public final class NodeManager {
propBuffer.put(columns[i].getName(), newprop);
// if the property is a pointer to another node, change the property type to NODE
/* if ((rel.reftype == Relation.REFERENCE) && rel.usesPrimaryKey()) {
// FIXME: References to anything other than the primary key are not supported
newprop.convertToNodeReference(rel.otherType);
} */
// mark property as clean, since it's fresh from the db
newprop.dirty = false;
}
@ -1842,7 +1828,8 @@ public final class NodeManager {
DbColumn[] columns2 = dbmap.getColumns();
for (int i=0; i<columns2.length; i++) {
Relation rel = columns2[i].getRelation();
if (rel != null) {
if (rel != null && (rel.reftype == Relation.PRIMITIVE ||
rel.reftype == Relation.REFERENCE)) {
Property prop = (Property) propBuffer.get(columns2[i].getName());
if (prop == null) {