Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-11-09 04:04:23 +0000
committerEike Stepper2012-11-09 04:04:23 +0000
commit776874bc9b9431ed0972c66da1094ef19ab023bb (patch)
tree0bf7ea73c6969bf5316a649dba91f0405ec02e64
parent45217da3c67b0e3535e6f56fa5c0f304dacbc8ef (diff)
downloadcdo-776874bc9b9431ed0972c66da1094ef19ab023bb.tar.gz
cdo-776874bc9b9431ed0972c66da1094ef19ab023bb.tar.xz
cdo-776874bc9b9431ed0972c66da1094ef19ab023bb.zip
Revert "[344805] [DB] Add new type mapping: Boolean from VARCHAR https://bugs.eclipse.org/bugs/show_bug.cgi?id=344805"
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java4
2 files changed, 2 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
index 6853c9e9a8..810c34bcc6 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
@@ -12,8 +12,7 @@
* Kai Schlamp - bug 282976: [DB] Influence Mappings through EAnnotations
* Stefan Winkler - bug 282976: [DB] Influence Mappings through EAnnotations
* Stefan Winkler - bug 285270: [DB] Support XSD based models
- * Stefan Winkler - bug 285426: [DB] Implement user-defined typeMapping support
- * Erdal Karaca - bug 344805: [DB] Added new type mapping Boolean from VARCHAR
+ * Stefan Winkler - Bug 285426: [DB] Implement user-defined typeMapping support
*/
package org.eclipse.emf.cdo.server.internal.db.mapping;
@@ -736,9 +735,6 @@ public class CoreTypeMappings
public static final Factory FACTORY_OBJECT_SMALLINT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
+ ".BooleanObject_SMALLINT", EcorePackage.eINSTANCE.getEBooleanObject(), DBType.SMALLINT));
- public static final Factory FACTORY_OBJECT_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
- + ".BooleanObject_VARCHAR", EcorePackage.eINSTANCE.getEBooleanObject(), DBType.VARCHAR));
-
@Override
public Object getResultSetValue(ResultSet resultSet) throws SQLException
{
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
index 299ae36301..e828a11f1e 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
@@ -7,8 +7,7 @@
*
* Contributors:
* Stefan Winkler - initial API and implementation
- * Stefan Winkler - bug 285426: [DB] Implement user-defined typeMapping support
- * Erdal Karaca - bug 344805: [DB] Added new type mapping Boolean from VARCHAR
+ * Stefan Winkler - Bug 285426: [DB] Implement user-defined typeMapping support
*/
package org.eclipse.emf.cdo.server.internal.db.mapping;
@@ -125,7 +124,6 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
container.registerFactory(CoreTypeMappings.TMBoolean.FACTORY_SMALLINT);
container.registerFactory(CoreTypeMappings.TMBoolean.FACTORY_OBJECT);
container.registerFactory(CoreTypeMappings.TMBoolean.FACTORY_OBJECT_SMALLINT);
- container.registerFactory(CoreTypeMappings.TMBoolean.FACTORY_OBJECT_VARCHAR);
container.registerFactory(CoreTypeMappings.TMByte.FACTORY);
container.registerFactory(CoreTypeMappings.TMByte.FACTORY_OBJECT);
container.registerFactory(CoreTypeMappings.TMBytes.FACTORY);

Back to the top