summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-13 08:57:36 (EDT)
committerEike Stepper2007-09-13 08:57:36 (EDT)
commit067a4e6039b16faf91ca5b2aca6706f01464dd7a (patch)
tree334c1b7ec1f0677efdf244b09baf080a62b54f94
parent559bf5a3b70d01e97aecff250507684e6011c40c (diff)
downloadcdo-067a4e6039b16faf91ca5b2aca6706f01464dd7a.zip
cdo-067a4e6039b16faf91ca5b2aca6706f01464dd7a.tar.gz
cdo-067a4e6039b16faf91ca5b2aca6706f01464dd7a.tar.bz2
[202833] Horizontal Mapping Strategy
https://bugs.eclipse.org/bugs/show_bug.cgi?id=202833
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java5
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java6
2 files changed, 4 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
index 90f07b5..63c9567 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
@@ -236,7 +236,7 @@ public abstract class MappingStrategy implements IMappingStrategy
while (classIt.hasNext())
{
CDOClass cdoClass = classIt.next();
- ClassMapping mapping = (ClassMapping)ClassServerInfo.getClassMapping(cdoClass);
+ IClassMapping mapping = ClassServerInfo.getClassMapping(cdoClass);
if (mapping != null)
{
IDBTable table = mapping.getTable();
@@ -278,13 +278,14 @@ public abstract class MappingStrategy implements IMappingStrategy
String suffix = " WHERE " + CDODBSchema.ATTRIBUTES_ID + "=" + id;
for (CDOClass cdoClass : getClassesWithObjectInfo())
{
- ClassMapping mapping = (ClassMapping)ClassServerInfo.getClassMapping(cdoClass);
+ IClassMapping mapping = ClassServerInfo.getClassMapping(cdoClass);
if (mapping != null)
{
IDBTable table = mapping.getTable();
if (table != null)
{
String sql = prefix + table + suffix;
+ if (TRACER.isEnabled()) TRACER.trace(sql);
ResultSet resultSet = null;
try
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
index 61ab361..0d1e83d 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
@@ -273,11 +273,7 @@ public final class DBUtil
}
String sql = builder.toString();
- if (TRACER.isEnabled())
- {
- TRACER.trace(sql);
- }
-
+ if (TRACER.isEnabled()) TRACER.trace(sql);
Statement statement = null;
ResultSet resultSet = null;