AfflictionNetworks/depot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fail with a useful error message any time a migration tries to reference a

Browse Source 
non-existent field.
This commit is contained in:
Michael Bayne
2010-02-10 16:47:31 +00:00
parent 9661056e10
commit cdeb8eac8a
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/samskivert/depot/SchemaMigration.java
+18 -9
View File
@@ -89,11 +89,7 @@ public abstract class SchemaMigration extends Modifier
@Override @Override
public void init (String tableName, Map<String, FieldMarshaller<?>> marshallers) { public void init (String tableName, Map<String, FieldMarshaller<?>> marshallers) {
super.init(tableName, marshallers); super.init(tableName, marshallers);
FieldMarshaller<?> fm = marshallers.get(_newColumnName); FieldMarshaller<?> fm = requireMarshaller(marshallers, _newColumnName);
if (fm == null) {
throw new IllegalArgumentException(
_tableName + " does not contain '" + _newColumnName + "' field.");
}
_newColumnDef = fm.getColumnDefinition(); _newColumnDef = fm.getColumnDefinition();
} }
@@ -146,8 +142,9 @@ public abstract class SchemaMigration extends Modifier
@Override @Override
public void init (String tableName, Map<String, FieldMarshaller<?>> marshallers) { public void init (String tableName, Map<String, FieldMarshaller<?>> marshallers) {
super.init(tableName, marshallers); super.init(tableName, marshallers);
_columnName = marshallers.get(_fieldName).getColumnName(); FieldMarshaller<?> marsh = requireMarshaller(marshallers, _fieldName);
_newColumnDef = marshallers.get(_fieldName).getColumnDefinition(); _columnName = marsh.getColumnName();
_newColumnDef = marsh.getColumnDefinition();
} }
@Override @Override
@@ -185,8 +182,9 @@ public abstract class SchemaMigration extends Modifier
@Override @Override
public void init (String tableName, Map<String, FieldMarshaller<?>> marshallers) { public void init (String tableName, Map<String, FieldMarshaller<?>> marshallers) {
super.init(tableName, marshallers); super.init(tableName, marshallers);
_columnName = marshallers.get(_fieldName).getColumnName(); FieldMarshaller<?> marsh = requireMarshaller(marshallers, _fieldName);
_newColumnDef = marshallers.get(_fieldName).getColumnDefinition(); _columnName = marsh.getColumnName();
_newColumnDef = marsh.getColumnDefinition();
} }
@Override @Override
@@ -271,6 +269,17 @@ public abstract class SchemaMigration extends Modifier
_targetVersion = targetVersion; _targetVersion = targetVersion;
} }
protected FieldMarshaller<?> requireMarshaller (
Map<String, FieldMarshaller<?>> marshallers, String fieldName)
{
FieldMarshaller<?> marsh = marshallers.get(fieldName);
if (marsh == null) {
throw new IllegalArgumentException(
"'" + _tableName + "' does not contain field '" + fieldName + "'");
}
return marsh;
}
protected int _targetVersion; protected int _targetVersion;
protected String _tableName; protected String _tableName;
} }