diff options
| author | Eike Stepper | 2011-08-18 06:20:07 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-08-18 06:20:07 +0000 |
| commit | a0d9d16f88075e1f5bffeea7e708c59ad43e65a4 (patch) | |
| tree | 1851d24b424d85ade81be94b55a65db8b75a1fb8 /plugins/org.eclipse.emf.cdo.server.db | |
| parent | ecc6934c11d703ee3f9b20613e6c60160b1373de (diff) | |
| download | cdo-a0d9d16f88075e1f5bffeea7e708c59ad43e65a4.tar.gz cdo-a0d9d16f88075e1f5bffeea7e708c59ad43e65a4.tar.xz cdo-a0d9d16f88075e1f5bffeea7e708c59ad43e65a4.zip | |
[354963] handleRevisions() does not work correctly for sub branches
https://bugs.eclipse.org/bugs/show_bug.cgi?id=354963
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.db')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java index 04225840f7..6f337b26e4 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java @@ -969,12 +969,14 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp builder.append("=? AND "); //$NON-NLS-1$ builder.append(CDODBSchema.ATTRIBUTES_CREATED); - builder.append("<=?"); //$NON-NLS-1$ + builder.append(">=?"); //$NON-NLS-1$ builder.append(" AND ("); //$NON-NLS-1$ builder.append(CDODBSchema.ATTRIBUTES_REVISED); - builder.append("=0 OR "); //$NON-NLS-1$ + builder.append("<=? OR "); //$NON-NLS-1$ builder.append(CDODBSchema.ATTRIBUTES_REVISED); - builder.append(">=?)"); //$NON-NLS-1$ + builder.append("="); //$NON-NLS-1$ + builder.append(CDOBranchPoint.UNSPECIFIED_DATE); + builder.append(")"); //$NON-NLS-1$ } IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler(); |