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

The buildIndex() magic expects an array of colums, not a list.

Browse Source
This commit is contained in:
Par Winzell
2009-01-22 16:43:21 +00:00
parent 7dbc58d426
commit 0569f8f8ff
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/samskivert/depot/impl/DepotMarshaller.java
+11 -4
View File
@@ -40,6 +40,7 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.samskivert.util.ArrayUtil; import com.samskivert.util.ArrayUtil;
import com.samskivert.util.StringUtil;
import com.samskivert.util.Tuple; import com.samskivert.util.Tuple;
import com.samskivert.jdbc.ColumnDefinition; import com.samskivert.jdbc.ColumnDefinition;
@@ -229,14 +230,15 @@ public class DepotMarshaller<T extends PersistentRecord>
if (entity != null) { if (entity != null) {
// add any indices needed for uniqueness constraints // add any indices needed for uniqueness constraints
for (UniqueConstraint constraint : entity.uniqueConstraints()) { for (UniqueConstraint constraint : entity.uniqueConstraints()) {
List<ColumnExp> colExps = Lists.newArrayList(); ColumnExp[] colExps = new ColumnExp[constraint.fields().length];
int ii = 0;
for (String field : constraint.fields()) { for (String field : constraint.fields()) {
FieldMarshaller<?> fm = _fields.get(field); FieldMarshaller<?> fm = _fields.get(field);
if (fm == null) { if (fm == null) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Unknown unique constraint field: " + field); "Unknown unique constraint field: " + field);
} }
colExps.add(new ColumnExp(_pClass, field)); colExps[ii ++] = new ColumnExp(_pClass, field);
} }
_indexes.add(buildIndex(constraint.name(), true, colExps)); _indexes.add(buildIndex(constraint.name(), true, colExps));
} }
@@ -496,7 +498,7 @@ public class DepotMarshaller<T extends PersistentRecord>
if (getTableName() == null) { if (getTableName() == null) {
return; return;
} }
// figure out the list of fields that correspond to actual table columns and generate the // figure out the list of fields that correspond to actual table columns and generate the
// SQL used to create and migrate our table (unless we're a computed entity) // SQL used to create and migrate our table (unless we're a computed entity)
_columnFields = new String[_allFields.length]; _columnFields = new String[_allFields.length];
@@ -535,7 +537,7 @@ public class DepotMarshaller<T extends PersistentRecord>
return 0; return 0;
} }
}); });
// fetch all relevant information regarding our table from the database // fetch all relevant information regarding our table from the database
TableMetaData metaData = TableMetaData.load(ctx, getTableName()); TableMetaData metaData = TableMetaData.load(ctx, getTableName());
@@ -1118,6 +1120,11 @@ public class DepotMarshaller<T extends PersistentRecord>
pkColumns.add(rs.getString("COLUMN_NAME")); pkColumns.add(rs.getString("COLUMN_NAME"));
} }
} }
public String toString ()
{
return StringUtil.fieldsToString(this);
}
} }
/** The persistent object class that we manage. */ /** The persistent object class that we manage. */