diff options
author | Eike Stepper | 2009-07-28 14:06:38 +0000 |
---|---|---|
committer | Eike Stepper | 2009-07-28 14:06:38 +0000 |
commit | 08e7320ce9012fbe04b313f40f476837933a633c (patch) | |
tree | 323858f57d40da43c7df44bb3825af49b9793f05 /plugins | |
parent | 8fbfad821595ee201f5e92ee3b4d8ec501a8c46a (diff) | |
download | cdo-08e7320ce9012fbe04b313f40f476837933a633c.tar.gz cdo-08e7320ce9012fbe04b313f40f476837933a633c.tar.xz cdo-08e7320ce9012fbe04b313f40f476837933a633c.zip |
reformat
Diffstat (limited to 'plugins')
7 files changed, 10 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractQueryStatement.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractQueryStatement.java index 5e2ef2af91..3a62b16bad 100644 --- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractQueryStatement.java +++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/AbstractQueryStatement.java @@ -31,7 +31,6 @@ public abstract class AbstractQueryStatement<Result> extends AbstractDBAccessor PreparedStatement preparedStatement = null; try { - preparedStatement = getPreparedStatement(connection); ResultSet resultSet = preparedStatement.executeQuery(); connection.commit(); diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreChunkReader.java index 9449d8726f..04ac422b6c 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreChunkReader.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreChunkReader.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Stefan Winkler - Bug 283998: [DB] Chunk reading for multiple chunks fails @@ -60,6 +60,7 @@ public class DBStoreChunkReader extends StoreChunkReader implements IDBStoreChun { builder.append(" OR "); //$NON-NLS-1$ } + builder.append(CDODBSchema.LIST_IDX); builder.append("="); //$NON-NLS-1$ builder.append(index); diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java index a9edb800c8..c16c1fad1e 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * Stefan Winkler - 271444: [DB] Multiple refactorings https://bugs.eclipse.org/bugs/show_bug.cgi?id=271444 - * Christopher Albert - 254455: [DB] Support FeatureMaps https://bugs.eclipse.org/bugs/show_bug.cgi?id=254455 + * Christopher Albert - 254455: [DB] Support FeatureMaps https://bugs.eclipse.org/bugs/show_bug.cgi?id=254455 */ package org.eclipse.emf.cdo.server.internal.db.mapping.horizontal; @@ -253,11 +253,13 @@ public abstract class AbstractFeatureMapTableMapping implements IListMapping builder.append(fields[i].getName()); builder.append(", "); //$NON-NLS-1$ } + for (int i = 0; i < columnNames.size(); i++) { builder.append(columnNames.get(i)); builder.append(", "); //$NON-NLS-1$ } + builder.append(CDODBSchema.FEATUREMAP_IDX); builder.append(", "); //$NON-NLS-1$ builder.append(CDODBSchema.FEATUREMAP_TAG); @@ -266,8 +268,8 @@ public abstract class AbstractFeatureMapTableMapping implements IListMapping { builder.append("?, "); } - builder.append("?, ?)"); + builder.append("?, ?)"); sqlInsert = builder.toString(); } @@ -636,6 +638,7 @@ public abstract class AbstractFeatureMapTableMapping implements IListMapping addFeature(tag); column = tagMap.get(tag); } + return column; } @@ -649,13 +652,13 @@ public abstract class AbstractFeatureMapTableMapping implements IListMapping protected ITypeMapping getTypeMapping(Long tag) { - ITypeMapping typeMapping = typeMappings.get(tag); if (typeMapping == null) { addFeature(tag); typeMapping = typeMappings.get(tag); } + return typeMapping; } diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2.java index 46ba0781c7..93bf453f3c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2.java @@ -128,8 +128,8 @@ public class AllTestsDBH2 extends DBConfigs reusableFolder = createDBFolder(); IOUtil.delete(reusableFolder); } - dbFolder = reusableFolder; + dbFolder = reusableFolder; if (defaultDataSource == null) { defaultDataSource = new JdbcDataSource(); diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java index 9654371519..c442f1e498 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java @@ -153,8 +153,8 @@ public class AllTestsDBH2NonAudit extends DBConfigs reusableFolder = createDBFolder(); IOUtil.delete(reusableFolder); } - dbFolder = reusableFolder; + dbFolder = reusableFolder; if (defaultDataSource == null) { defaultDataSource = new JdbcDataSource(); diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java index 77f6640eb5..af448dbbb4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java @@ -93,7 +93,6 @@ public class AllTestsDBHsqldb extends DBConfigs @Override protected DataSource createDataSource(String repoName) { - HSQLDBDataSource dataSource = new HSQLDBDataSource(); dataSource.setDatabase("jdbc:hsqldb:mem:" + repoName); dataSource.setUser("sa"); @@ -108,7 +107,6 @@ public class AllTestsDBHsqldb extends DBConfigs } dataSources.add(dataSource); - return dataSource; } diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java index 32c2a696b2..4f414fd527 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java @@ -108,7 +108,6 @@ public class AllTestsDBMysql extends DBConfigs DBUtil.close(stmt); DBUtil.close(connection); } - } @Override |