summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Winkler2010-12-19 06:26:52 (EST)
committerStefan Winkler2010-12-19 06:26:52 (EST)
commit914fe21b0f7795f620ee9508b3a2140ef1280fc0 (patch)
treeb3c7223fbddc776f2cdb16b2727a76d4232e2f8b
parent0aaa086109901f53ce05e3eec160de117938d2e8 (diff)
downloadcdo-914fe21b0f7795f620ee9508b3a2140ef1280fc0.zip
cdo-914fe21b0f7795f620ee9508b3a2140ef1280fc0.tar.gz
cdo-914fe21b0f7795f620ee9508b3a2140ef1280fc0.tar.bz2
[332891] [DB] Error in FeatureMapTest.testFeatureMaps
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332891
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
index 0cc0a13..57076ca 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
@@ -244,9 +244,6 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
builder.append(","); //$NON-NLS-1$
builder.append(CDODBSchema.FEATUREMAP_VERSION_REMOVED);
builder.append(","); //$NON-NLS-1$
- builder.append(CDODBSchema.FEATUREMAP_IDX);
- builder.append(","); //$NON-NLS-1$
- builder.append(CDODBSchema.FEATUREMAP_VALUE);
for (int i = 0; i < columnNames.size(); i++)
{
@@ -257,7 +254,7 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
builder.append(CDODBSchema.FEATUREMAP_IDX);
builder.append(", "); //$NON-NLS-1$
builder.append(CDODBSchema.FEATUREMAP_TAG);
- builder.append(") VALUES (?, ?, ?, ?, ?, ?, "); //$NON-NLS-1$
+ builder.append(") VALUES (?, ?, ?, ?, "); //$NON-NLS-1$
for (int i = 0; i < columnNames.size(); i++)
{
builder.append("?, "); //$NON-NLS-1$
@@ -1214,7 +1211,6 @@ public class BranchingFeatureMapTableMappingWithRanges extends BasicAbstractList
pstmt.setInt(stmtIndex++, branchId);
pstmt.setInt(stmtIndex++, version);
pstmt.setNull(stmtIndex++, DBType.INTEGER.getCode()); // versionRemoved
- pstmt.setInt(stmtIndex++, index);
for (int i = 0; i < columnNames.size(); i++)
{