summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-06-06 03:45:21 (EDT)
committerEike Stepper2006-06-06 03:45:21 (EDT)
commit52a1d216665628b976941e4462caf6eac4509a15 (patch)
tree5fe4ae524f17fa1a87488418d78ea9e80bfb3a61
parent22290e1256ba655146f31d475a33038936403ff0 (diff)
downloadcdo-52a1d216665628b976941e4462caf6eac4509a15.zip
cdo-52a1d216665628b976941e4462caf6eac4509a15.tar.gz
cdo-52a1d216665628b976941e4462caf6eac4509a15.tar.bz2
[144295] problem with objects deletion
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java18
1 files changed, 15 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
index 0ad194a..8162716 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
@@ -576,11 +576,11 @@ public class MapperImpl extends ServiceImpl implements Mapper, SQLConstants
while (classInfo != null)
{
- removeSegment(oid, classInfo.getTableName());
+ removeUserSegment(oid, classInfo.getTableName());
classInfo = classInfo.getParent();
}
- removeSegment(oid, OBJECT_TABLE);
+ removeSegment(oid);
}
protected int selectCIDOfObject(long oid)
@@ -598,7 +598,19 @@ public class MapperImpl extends ServiceImpl implements Mapper, SQLConstants
}
}
- protected void removeSegment(long oid, String tableName)
+ protected void removeSegment(long oid)
+ {
+ StringBuffer query = new StringBuffer("DELETE FROM ");
+ query.append(OBJECT_TABLE);
+ query.append(" WHERE ");
+ query.append(OBJECT_OID_COLUMN);
+ query.append("=");
+ query.append(oid);
+
+ sql(query.toString());
+ }
+
+ protected void removeUserSegment(long oid, String tableName)
{
StringBuffer query = new StringBuffer("DELETE FROM ");
query.append(tableName);