diff options
4 files changed, 20 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java index 306227607b..8d283b5cc2 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java @@ -450,7 +450,10 @@ public class DBStoreAccessor implements IDBStoreAccessor for (CDOClassImpl cdoClass : cdoClasses) { IMapping mapping = mappingStrategy.getMapping(cdoClass); - affectedTables.addAll(mapping.getAffectedTables()); + if (mapping != null) + { + affectedTables.addAll(mapping.getAffectedTables()); + } } } diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java index 135532aae6..659bc1878c 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java @@ -30,6 +30,11 @@ public class HorizontalMappingStrategy extends MappingStrategy @Override protected IMapping createMapping(CDOClass cdoClass) { + if (cdoClass.isAbstract()) + { + return null; + } + return new HorizontalMapping(this, cdoClass); } } diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java index 17a541c68f..e79593794d 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java @@ -95,6 +95,11 @@ public abstract class Mapping implements IMapping protected void executeSQL(IDBStoreAccessor storeAccessor, String sql) throws DBException { + if (TRACER.isEnabled()) + { + TRACER.trace(sql); + } + try { Statement statement = storeAccessor.getStatement(); diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java index 428f486b4a..ab96be3f48 100644 --- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java +++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java @@ -46,4 +46,10 @@ public class DataSourceConnectionProvider implements ConnectionProvider throw new DBException(ex); } } + + @Override + public String toString() + { + return dataSource.toString(); + } } |