You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2011/12/10 14:06:46 UTC
svn commit: r1212788 - in
/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql:
sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/
sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/
sql-impl/src/ma...
Author: kevin
Date: Sat Dec 10 13:06:45 2011
New Revision: 1212788
URL: http://svn.apache.org/viewvc?rev=1212788&view=rev
Log:
ISIS-147: Updated documentation. Updated type override support on all fields by object name:
isis.persistor.sql.automapper.type.<object>.<property>=<SQL data type>
Modified:
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/AbstractFieldMappingFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/FieldMappingLookup.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AbstractAutoMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcAbstractReferenceFieldMapping.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcBinaryValueMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcColorValueMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateTimeMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcGeneralValueMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcMoneyValueMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcTimeMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcTimestampMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/mapping/FieldMappingFactory.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/src/docbkx/guide/isis-sql-objectstore.xml
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/AbstractFieldMappingFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/AbstractFieldMappingFactory.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/AbstractFieldMappingFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/AbstractFieldMappingFactory.java Sat Dec 10 13:06:45 2011
@@ -19,12 +19,20 @@
package org.apache.isis.runtimes.dflt.objectstores.sql;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
public abstract class AbstractFieldMappingFactory implements FieldMappingFactory {
- final String type;
- public AbstractFieldMappingFactory(final String type) {
- this.type = type;
+ protected String getTypeOverride(ObjectSpecification object, final ObjectAssociation field, final String type) {
+ // isis.persistor.sql.automapper.default
+ final IsisConfiguration configParameters = IsisContext.getConfiguration();
+ String find = object.getShortIdentifier() + "." + field.getId();
+ final String property = SqlObjectStore.BASE_NAME + ".automapper.type." + find;
+ String dataType = configParameters.getString(property, type);
+ return dataType;
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/FieldMappingLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/FieldMappingLookup.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/FieldMappingLookup.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/FieldMappingLookup.java Sat Dec 10 13:06:45 2011
@@ -43,19 +43,19 @@ public class FieldMappingLookup {
private FieldMappingFactory referenceFieldMappingfactory;
private ObjectReferenceMappingFactory objectReferenceMappingfactory;
- public FieldMapping createMapping(final ObjectAssociation field) {
+ public FieldMapping createMapping(ObjectSpecification object, final ObjectAssociation field) {
final ObjectSpecification spec = field.getSpecification();
FieldMappingFactory factory = fieldMappings.get(spec);
if (factory != null) {
- return factory.createFieldMapping(field);
+ return factory.createFieldMapping(object, field);
} else if (spec.isEncodeable()) {
factory = new JdbcGeneralValueMapper.Factory(Defaults.TYPE_DEFAULT());
addFieldMappingFactory(spec, factory);
- return factory.createFieldMapping(field);
+ return factory.createFieldMapping(object, field);
} else {// if (true /* TODO test for reference */) {
factory = referenceFieldMappingfactory;
addFieldMappingFactory(spec, factory);
- return factory.createFieldMapping(field);
+ return factory.createFieldMapping(object, field);
// } else {
// throw new IsisException("No mapper for " + spec + " (no default mapper)");
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AbstractAutoMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AbstractAutoMapper.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AbstractAutoMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AbstractAutoMapper.java Sat Dec 10 13:06:45 2011
@@ -224,7 +224,7 @@ public abstract class AbstractAutoMapper
}
for (final ObjectAssociation field : oneToOneProperties) {
- final FieldMapping mapping = lookup.createMapping(field);
+ final FieldMapping mapping = lookup.createMapping(specification, field);
fieldMappings.add(mapping);
fieldMappingLookup.put(field, mapping);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcAbstractReferenceFieldMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcAbstractReferenceFieldMapping.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcAbstractReferenceFieldMapping.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcAbstractReferenceFieldMapping.java Sat Dec 10 13:06:45 2011
@@ -26,12 +26,12 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.runtimes.dflt.objectstores.sql.AbstractFieldMappingFactory;
import org.apache.isis.runtimes.dflt.objectstores.sql.DatabaseConnector;
import org.apache.isis.runtimes.dflt.objectstores.sql.Defaults;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
import org.apache.isis.runtimes.dflt.objectstores.sql.Sql;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
-import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
/**
@@ -44,18 +44,25 @@ import org.apache.isis.runtimes.dflt.run
* @version $Rev$ $Date$
*/
public class JdbcAbstractReferenceFieldMapping extends JdbcObjectReferenceFieldMapping {
+ private final String classnameColumn;
+ private final String dataType;
+
+ public static class Factory extends AbstractFieldMappingFactory {
+
+ public Factory(final String type) {
+ super();
+ }
- public static class Factory implements FieldMappingFactory {
@Override
- public FieldMapping createFieldMapping(final ObjectAssociation field) {
- return new JdbcAbstractReferenceFieldMapping(field);
+ public FieldMapping createFieldMapping(final ObjectSpecification object, final ObjectAssociation field) {
+ String dataType = getTypeOverride(object, field, Defaults.TYPE_LONG_STRING());
+ return new JdbcAbstractReferenceFieldMapping(field, dataType);
}
}
- private final String classnameColumn;
-
- public JdbcAbstractReferenceFieldMapping(final ObjectAssociation field) {
+ public JdbcAbstractReferenceFieldMapping(final ObjectAssociation field, String dataType) {
super(field);
+ this.dataType = dataType;
classnameColumn = Sql.identifier(getColumn() + "_cls");
}
@@ -66,7 +73,7 @@ public class JdbcAbstractReferenceFieldM
sql.append(", ");
sql.append(classnameColumn);
sql.append(" ");
- sql.append(Defaults.TYPE_LONG_STRING());
+ sql.append(dataType);
}
@Override
@@ -74,7 +81,7 @@ public class JdbcAbstractReferenceFieldM
super.appendCreateColumnDefinitions(sql);
sql.append(classnameColumn);
sql.append(" ");
- sql.append(Defaults.TYPE_LONG_STRING());
+ sql.append(dataType);
}
@Override
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcBinaryValueMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcBinaryValueMapper.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcBinaryValueMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcBinaryValueMapper.java Sat Dec 10 13:06:45 2011
@@ -18,10 +18,11 @@ package org.apache.isis.runtimes.dflt.ob
import org.apache.isis.core.commons.exceptions.IsisApplicationException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.runtimes.dflt.objectstores.sql.AbstractFieldMappingFactory;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
-import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
/**
@@ -31,16 +32,18 @@ import org.apache.isis.runtimes.dflt.run
*/
public class JdbcBinaryValueMapper extends AbstractJdbcFieldMapping {
- public static class Factory implements FieldMappingFactory {
+ public static class Factory extends AbstractFieldMappingFactory {
private final String type;
public Factory(final String type) {
+ super();
this.type = type;
}
@Override
- public FieldMapping createFieldMapping(final ObjectAssociation field) {
- return new JdbcBinaryValueMapper(field, type);
+ public FieldMapping createFieldMapping(final ObjectSpecification object, final ObjectAssociation field) {
+ String dataType = getTypeOverride(object, field, type);
+ return new JdbcBinaryValueMapper(field, dataType);
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcColorValueMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcColorValueMapper.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcColorValueMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcColorValueMapper.java Sat Dec 10 13:06:45 2011
@@ -18,10 +18,11 @@ package org.apache.isis.runtimes.dflt.ob
import org.apache.isis.applib.value.Color;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.runtimes.dflt.objectstores.sql.AbstractFieldMappingFactory;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
-import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
/**
@@ -31,16 +32,18 @@ import org.apache.isis.runtimes.dflt.run
*/
public class JdbcColorValueMapper extends AbstractJdbcFieldMapping {
- public static class Factory implements FieldMappingFactory {
+ public static class Factory extends AbstractFieldMappingFactory {
private final String type;
public Factory(final String type) {
+ super();
this.type = type;
}
@Override
- public FieldMapping createFieldMapping(final ObjectAssociation field) {
- return new JdbcColorValueMapper(field, type);
+ public FieldMapping createFieldMapping(final ObjectSpecification object, final ObjectAssociation field) {
+ String dataType = getTypeOverride(object, field, type);
+ return new JdbcColorValueMapper(field, dataType);
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateMapper.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateMapper.java Sat Dec 10 13:06:45 2011
@@ -25,11 +25,12 @@ import org.apache.isis.applib.PersistFai
import org.apache.isis.applib.value.Date;
import org.apache.isis.core.commons.exceptions.IsisApplicationException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.runtimes.dflt.objectstores.sql.AbstractFieldMappingFactory;
import org.apache.isis.runtimes.dflt.objectstores.sql.Defaults;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
-import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
@@ -42,17 +43,20 @@ import org.apache.isis.runtimes.dflt.run
public class JdbcDateMapper extends AbstractJdbcFieldMapping {
private final AdapterManager adapterManager;
+ private final String dataType;
- public static class Factory implements FieldMappingFactory {
+ public static class Factory extends AbstractFieldMappingFactory {
@Override
- public FieldMapping createFieldMapping(final ObjectAssociation field) {
- return new JdbcDateMapper(field);
+ public FieldMapping createFieldMapping(ObjectSpecification object, final ObjectAssociation field) {
+ String dataType = getTypeOverride(object, field, Defaults.TYPE_DATE());
+ return new JdbcDateMapper(field, dataType);
}
}
- protected JdbcDateMapper(final ObjectAssociation field) {
+ protected JdbcDateMapper(final ObjectAssociation field, final String dataType) {
super(field);
adapterManager = IsisContext.getPersistenceSession().getAdapterManager();
+ this.dataType = dataType;
}
@Override
@@ -92,7 +96,7 @@ public class JdbcDateMapper extends Abst
@Override
public String columnType() {
- return Defaults.TYPE_DATE();
+ return dataType;
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateTimeMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateTimeMapper.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateTimeMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcDateTimeMapper.java Sat Dec 10 13:06:45 2011
@@ -22,23 +22,28 @@ package org.apache.isis.runtimes.dflt.ob
import org.apache.isis.applib.value.DateTime;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.runtimes.dflt.objectstores.sql.AbstractFieldMappingFactory;
import org.apache.isis.runtimes.dflt.objectstores.sql.Defaults;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
-import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
public class JdbcDateTimeMapper extends AbstractJdbcFieldMapping {
- public static class Factory implements FieldMappingFactory {
+ private final String dataType;
+
+ public static class Factory extends AbstractFieldMappingFactory {
@Override
- public FieldMapping createFieldMapping(final ObjectAssociation field) {
- return new JdbcDateTimeMapper(field);
+ public FieldMapping createFieldMapping(ObjectSpecification object, final ObjectAssociation field) {
+ String dataType = getTypeOverride(object, field, Defaults.TYPE_DATETIME());
+ return new JdbcDateTimeMapper(field, dataType);
}
}
- protected JdbcDateTimeMapper(final ObjectAssociation field) {
+ protected JdbcDateTimeMapper(final ObjectAssociation field, final String dataType) {
super(field);
+ this.dataType = dataType;
}
@Override
@@ -66,7 +71,7 @@ public class JdbcDateTimeMapper extends
@Override
public String columnType() {
- return Defaults.TYPE_DATETIME();
+ return dataType;
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcGeneralValueMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcGeneralValueMapper.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcGeneralValueMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcGeneralValueMapper.java Sat Dec 10 13:06:45 2011
@@ -22,31 +22,27 @@ package org.apache.isis.runtimes.dflt.ob
import org.apache.isis.applib.value.Money;
import org.apache.isis.applib.value.Password;
import org.apache.isis.applib.value.Percentage;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.runtimes.dflt.objectstores.sql.AbstractFieldMappingFactory;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
-import org.apache.isis.runtimes.dflt.objectstores.sql.SqlObjectStore;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
-import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
-import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
public class JdbcGeneralValueMapper extends AbstractJdbcFieldMapping {
- public static class Factory implements FieldMappingFactory {
+ public static class Factory extends AbstractFieldMappingFactory {
private final String type;
public Factory(final String type) {
+ super();
this.type = type;
}
@Override
- public FieldMapping createFieldMapping(final ObjectAssociation field) {
- // isis.persistor.sql.automapper.default
- final IsisConfiguration configParameters = IsisContext.getConfiguration();
- final String property = SqlObjectStore.BASE_NAME + ".automapper.type." + field.getId();
- String dataType = configParameters.getString(property, type);
+ public FieldMapping createFieldMapping(final ObjectSpecification object, final ObjectAssociation field) {
+ String dataType = getTypeOverride(object, field, type);
return new JdbcGeneralValueMapper(field, dataType);
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcMoneyValueMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcMoneyValueMapper.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcMoneyValueMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcMoneyValueMapper.java Sat Dec 10 13:06:45 2011
@@ -21,6 +21,7 @@ package org.apache.isis.runtimes.dflt.ob
import org.apache.isis.applib.PersistFailedException;
import org.apache.isis.applib.value.Money;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
@@ -43,7 +44,7 @@ public class JdbcMoneyValueMapper extend
}
@Override
- public FieldMapping createFieldMapping(final ObjectAssociation field) {
+ public FieldMapping createFieldMapping(ObjectSpecification object, final ObjectAssociation field) {
return new JdbcMoneyValueMapper(field, type1, type2);
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcObjectReferenceFieldMapping.java Sat Dec 10 13:06:45 2011
@@ -21,21 +21,24 @@ package org.apache.isis.runtimes.dflt.ob
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.runtimes.dflt.objectstores.sql.AbstractFieldMappingFactory;
import org.apache.isis.runtimes.dflt.objectstores.sql.DatabaseConnector;
+import org.apache.isis.runtimes.dflt.objectstores.sql.Defaults;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
import org.apache.isis.runtimes.dflt.objectstores.sql.Sql;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
-import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
public class JdbcObjectReferenceFieldMapping extends JdbcObjectReferenceMapping implements FieldMapping {
- public static class Factory implements FieldMappingFactory {
+ public static class Factory extends AbstractFieldMappingFactory {
@Override
- public FieldMapping createFieldMapping(final ObjectAssociation field) {
+ public FieldMapping createFieldMapping(ObjectSpecification object, final ObjectAssociation field) {
if (field.getSpecification().isAbstract()) {
- return new JdbcAbstractReferenceFieldMapping(field);
+ String dataType = getTypeOverride(object, field, Defaults.TYPE_LONG_STRING());
+ return new JdbcAbstractReferenceFieldMapping(field, dataType);
}
return new JdbcObjectReferenceFieldMapping(field);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcTimeMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcTimeMapper.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcTimeMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcTimeMapper.java Sat Dec 10 13:06:45 2011
@@ -22,24 +22,30 @@ package org.apache.isis.runtimes.dflt.ob
import org.apache.isis.applib.PersistFailedException;
import org.apache.isis.applib.value.Time;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.runtimes.dflt.objectstores.sql.AbstractFieldMappingFactory;
import org.apache.isis.runtimes.dflt.objectstores.sql.Defaults;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
-import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
public class JdbcTimeMapper extends AbstractJdbcFieldMapping {
- public static class Factory implements FieldMappingFactory {
+ private final String dataType;
+
+ public static class Factory extends AbstractFieldMappingFactory {
+
@Override
- public FieldMapping createFieldMapping(final ObjectAssociation field) {
- return new JdbcTimeMapper(field);
+ public FieldMapping createFieldMapping(final ObjectSpecification object, final ObjectAssociation field) {
+ String dataType = getTypeOverride(object, field, Defaults.TYPE_TIME());
+ return new JdbcTimeMapper(field, dataType);
}
}
- protected JdbcTimeMapper(final ObjectAssociation field) {
+ protected JdbcTimeMapper(final ObjectAssociation field, final String dataType) {
super(field);
+ this.dataType = dataType;
}
@Override
@@ -69,7 +75,7 @@ public class JdbcTimeMapper extends Abst
@Override
public String columnType() {
- return Defaults.TYPE_TIME();
+ return dataType;
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcTimestampMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcTimestampMapper.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcTimestampMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/jdbc/JdbcTimestampMapper.java Sat Dec 10 13:06:45 2011
@@ -22,23 +22,29 @@ package org.apache.isis.runtimes.dflt.ob
import org.apache.isis.applib.value.TimeStamp;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.runtimes.dflt.objectstores.sql.AbstractFieldMappingFactory;
import org.apache.isis.runtimes.dflt.objectstores.sql.Defaults;
import org.apache.isis.runtimes.dflt.objectstores.sql.Results;
import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMapping;
-import org.apache.isis.runtimes.dflt.objectstores.sql.mapping.FieldMappingFactory;
public class JdbcTimestampMapper extends AbstractJdbcFieldMapping {
- public static class Factory implements FieldMappingFactory {
+ private final String dataType;
+
+ public static class Factory extends AbstractFieldMappingFactory {
+
@Override
- public FieldMapping createFieldMapping(final ObjectAssociation field) {
- return new JdbcTimestampMapper(field);
+ public FieldMapping createFieldMapping(final ObjectSpecification object, final ObjectAssociation field) {
+ String dataType = getTypeOverride(object, field, Defaults.TYPE_TIMESTAMP());
+ return new JdbcTimestampMapper(field, dataType);
}
}
- protected JdbcTimestampMapper(final ObjectAssociation field) {
+ protected JdbcTimestampMapper(final ObjectAssociation field, final String dataType) {
super(field);
+ this.dataType = dataType;
}
@Override
@@ -81,7 +87,7 @@ public class JdbcTimestampMapper extends
@Override
public String columnType() {
- return Defaults.TYPE_TIMESTAMP();
+ return dataType;
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/mapping/FieldMappingFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/mapping/FieldMappingFactory.java?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/mapping/FieldMappingFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/mapping/FieldMappingFactory.java Sat Dec 10 13:06:45 2011
@@ -19,8 +19,9 @@
package org.apache.isis.runtimes.dflt.objectstores.sql.mapping;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
public interface FieldMappingFactory {
- FieldMapping createFieldMapping(final ObjectAssociation field);
+ FieldMapping createFieldMapping(final ObjectSpecification object, final ObjectAssociation field);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/src/docbkx/guide/isis-sql-objectstore.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/src/docbkx/guide/isis-sql-objectstore.xml?rev=1212788&r1=1212787&r2=1212788&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/src/docbkx/guide/isis-sql-objectstore.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/src/docbkx/guide/isis-sql-objectstore.xml Sat Dec 10 13:06:45 2011
@@ -260,6 +260,45 @@
<para>[Percentage] is FLOAT</para>
</sect2>
+
+ <sect2>
+ <title>Modifying individual property types</title>
+
+ <para>By default, all property types will use the SQL datatype, as
+ determined above (see <xref
+ linkend="sec.mappers.modifiable-values" />), but it is possible to
+ override these values for individual object properties, by specifying
+ the following override in the properties file:</para>
+
+ <para><property>isis.persistor.sql.automapper.type.<object>.<property>=<SQL
+ data type></property></para>
+
+ <para>where </para>
+
+ <itemizedlist>
+ <listitem>
+ <para>object is the final part of the domain object name (e.g. in
+ my.domain.Member, it'll be Member)</para>
+ </listitem>
+
+ <listitem>
+ <para>property is the lower case property name (e.g. in getName(),
+ it'll be name)</para>
+ </listitem>
+
+ <listitem>
+ <para>SQL data type is an acceptable datatype (e.g. VARCHAR(255)
+ )</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Again, please be very careful about changing the defaults as the
+ value mappers make assumptions about the underlying data type. </para>
+
+ <para>It is safe to change the size of VARCHAR() types, e.g. when you
+ know only a partcular field requires more that 65 characters, the
+ default String length.</para>
+ </sect2>
</sect1>
<sect1>
@@ -292,7 +331,7 @@
<title>Columns</title>
<sect3>
- <title>Internal columns</title>
+ <title>Internal column: pk_id</title>
<para>ID column: PK_ID</para>
@@ -306,7 +345,14 @@
over-ridden by specifying the new name in the properties
file:</para>
- <para></para>
+ <para><property>isis.persistor.sql.pk_id=id</property></para>
+
+ <para><property></property></para>
+
+ <para><property>ID column: ID</property></para>
+
+ <para><property>Used internally by Isis to record services, in the
+ table "ISIS_ADMIN_SERVICES".</property></para>
</sect3>
<sect3>
@@ -347,6 +393,31 @@
</sect3>
</sect2>
</sect1>
+
+ <sect1>
+ <title>Number of instances returned by queries</title>
+
+ <para>By default, only up to 100 object instances are returned by
+ queries. This value can be changed by specifying:</para>
+
+ <para><property>isis.persistor.sql.maxinstances=100</property></para>
+ </sect1>
+
+ <sect1>
+ <title>Versioning</title>
+
+ <para>Isis uses a version number to assist in detecting concurrency
+ conflicts.</para>
+
+ <para>However, if you need to turn off versioning completely, or for a
+ particular table, you can control it with:</para>
+
+ <para><property>isis.persistor.sql.default.versioning=false</property></para>
+
+ <para>for global control, or by table:</para>
+
+ <para><property>isis.persistor.sql.default.versioning.members=false</property></para>
+ </sect1>
</chapter>
<chapter id="ch.supported.dbs">
@@ -508,7 +579,7 @@
<code>org.apache.isis.runtimes.dflt.objectstores.sql.Defaults</code>
contains the following:</para>
- <para>Programmatic, at runtime: </para>
+ <para>Programmatic, at runtime:</para>
<itemizedlist>
<listitem>
@@ -520,20 +591,20 @@
<para><itemizedlist>
<listitem>
- <para>Primary key column: </para>
+ <para>Primary key column:</para>
<para><code>isis.persistor.sql.default.pk_id=pk_id</code></para>
</listitem>
<listitem>
- <para>Service ID column: </para>
+ <para>Service ID column:</para>
<para><code>isis.persistor.sql.default.id=id</code></para>
</listitem>
<listitem>
<para>Maximum records returned by objectstore methods that return a
- list/collection, such as <code>allMatches()</code>, etc: </para>
+ list/collection, such as <code>allMatches()</code>, etc:</para>
<para><code>isis.persistor.sql.default.maxinstances=100</code></para>
</listitem>
@@ -549,7 +620,7 @@
<title>Polymorphism</title>
<para>The SQL Objectstore supports polymorphic classes. Both properties
- and collections are supported. </para>
+ and collections are supported.</para>
<sect1>
<title>Properties</title>
@@ -578,10 +649,10 @@
<para>Used to map 1-to-many collections by creating, in the collection
child table (which may be an interface or abstract class), 2 columns
- per parent collection. </para>
+ per parent collection.</para>
- <para>The first column is the class type, the second is the entity ID.
- </para>
+ <para>The first column is the class type, the second is the entity
+ ID.</para>
<para>The columns are named by combining the final part of the parent
class name and the collection variable name.</para>
@@ -594,7 +665,7 @@
<title>PolymorphicForeignKeyInChildCollectionMapper</title>
<para>Used to map 1-to-many collections by creating, in the child
- table, 1 column per parent collection. </para>
+ table, 1 column per parent collection.</para>
<para>The column is named by combining the final part of the parent
class name and the collection variable name.</para>