summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-24 12:29:59 (EDT)
committerEike Stepper2007-08-24 12:29:59 (EDT)
commitdd342eefc2478120f68f96fb5e11b05f88c41b6d (patch)
tree772f3e8903ff2a0ec641a6ae1185aaf278b2c5c8
parent8b41b79857310d838d32752b83cf2fa5e75eff4e (diff)
downloadcdo-dd342eefc2478120f68f96fb5e11b05f88c41b6d.zip
cdo-dd342eefc2478120f68f96fb5e11b05f88c41b6d.tar.gz
cdo-dd342eefc2478120f68f96fb5e11b05f88c41b6d.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java5
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java6
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 3062276..8d283b5 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 135532a..659bc18 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 17a541c..e795937 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 428f486..ab96be3 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();
+ }
}