From a8da2b48bd5b7299f4d10b390dfcd9283dd5fbbd Mon Sep 17 00:00:00 2001 From: hns Date: Wed, 19 Nov 2003 15:09:54 +0000 Subject: [PATCH] Re-add check if Relation is PRIMITIVE or REFERENCE when creating properties in createNode (was removed yesterday, not sure it's really needed) Remove code that was commented out and isn't coming back --- src/helma/objectmodel/db/NodeManager.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/helma/objectmodel/db/NodeManager.java b/src/helma/objectmodel/db/NodeManager.java index 5d648587..1c8f654e 100644 --- a/src/helma/objectmodel/db/NodeManager.java +++ b/src/helma/objectmodel/db/NodeManager.java @@ -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