Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-10-12 06:03:03 +0000
committerEike Stepper2015-10-12 06:03:03 +0000
commit43d99a2e71aa1bd48998ab017b3e37672792ed85 (patch)
tree71a3d0c912f0a7b3291af2395bc52d9d6396ed18
parentd2c2204b5bf92ffe094b3265de57e005cb634596 (diff)
downloadcdo-43d99a2e71aa1bd48998ab017b3e37672792ed85.tar.gz
cdo-43d99a2e71aa1bd48998ab017b3e37672792ed85.tar.xz
cdo-43d99a2e71aa1bd48998ab017b3e37672792ed85.zip
[Releng] Consolidate SQL building w.r.t. timestamps
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java7
2 files changed, 5 insertions, 13 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
index f80817aac1..2efd6d6307 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
@@ -612,16 +612,13 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
builder.append(ATTRIBUTES_REVISED);
builder.append(">=? OR "); //$NON-NLS-1$
builder.append(ATTRIBUTES_REVISED);
- builder.append("="); //$NON-NLS-1$
- builder.append(CDOBranchPoint.UNSPECIFIED_DATE);
- builder.append(")"); //$NON-NLS-1$
+ builder.append("=0)"); //$NON-NLS-1$
timeParameters = 2;
}
else
{
builder.append(ATTRIBUTES_REVISED);
- builder.append("="); //$NON-NLS-1$
- builder.append(CDOBranchPoint.UNSPECIFIED_DATE);
+ builder.append("=0"); //$NON-NLS-1$
}
}
}
@@ -688,9 +685,7 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
builder.append(ATTRIBUTES_REVISED);
builder.append("<=? OR "); //$NON-NLS-1$
builder.append(ATTRIBUTES_REVISED);
- builder.append("="); //$NON-NLS-1$
- builder.append(CDOBranchPoint.UNSPECIFIED_DATE);
- builder.append(")"); //$NON-NLS-1$
+ builder.append("=0)"); //$NON-NLS-1$
}
IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
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 6c9c84fa34..8adf1eec7d 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
@@ -838,8 +838,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
else
{
builder.append(ATTRIBUTES_REVISED);
- builder.append("="); //$NON-NLS-1$
- builder.append(CDOBranchPoint.UNSPECIFIED_DATE);
+ builder.append("=0"); //$NON-NLS-1$
}
}
}
@@ -928,9 +927,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
builder.append(ATTRIBUTES_REVISED);
builder.append("<=? OR "); //$NON-NLS-1$
builder.append(ATTRIBUTES_REVISED);
- builder.append("="); //$NON-NLS-1$
- builder.append(CDOBranchPoint.UNSPECIFIED_DATE);
- builder.append(")"); //$NON-NLS-1$
+ builder.append("=0)"); //$NON-NLS-1$
}
IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();

Back to the top