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

The query is in no way guaranteed to uniquely keyed rows, so let's stuff the result into a Set. We should probably add the 'unique' modifier to the actual query, but that requires a bit more cross-dialect-and-version research than I'm willing to give it just now.

Browse Source
This commit is contained in:
Par Winzell
2008-04-06 14:57:14 +00:00
parent 6e532a2b37
commit 13121249cb
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/samskivert/jdbc/depot/FindAllQuery.java
+9 -5
View File
@@ -26,8 +26,10 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import com.samskivert.io.PersistenceException; import com.samskivert.io.PersistenceException;
@@ -82,7 +84,7 @@ public abstract class FindAllQuery<T extends PersistentRecord>
{ {
Map<Key<T>, T> entities = new HashMap<Key<T>, T>(); Map<Key<T>, T> entities = new HashMap<Key<T>, T>();
List<Key<T>> allKeys = new ArrayList<Key<T>>(); List<Key<T>> allKeys = new ArrayList<Key<T>>();
List<Key<T>> fetchKeys = new ArrayList<Key<T>>(); Set<Key<T>> fetchKeys = new HashSet<Key<T>>();
_builder.newQuery(new SelectClause<T>(_type, _marsh.getPrimaryKeyFields(), _clauses)); _builder.newQuery(new SelectClause<T>(_type, _marsh.getPrimaryKeyFields(), _clauses));
PreparedStatement stmt = _builder.prepare(conn); PreparedStatement stmt = _builder.prepare(conn);
@@ -116,16 +118,18 @@ public abstract class FindAllQuery<T extends PersistentRecord>
if (_marsh.getPrimaryKeyFields().length == 1) { if (_marsh.getPrimaryKeyFields().length == 1) {
// Single-column keys result in the compact IN(keyVal1, keyVal2, ...) // Single-column keys result in the compact IN(keyVal1, keyVal2, ...)
Comparable[] keyFieldValues = new Comparable[fetchKeys.size()]; Comparable[] keyFieldValues = new Comparable[fetchKeys.size()];
for (int ii = 0; ii < keyFieldValues.length; ii ++) { int ii = 0;
keyFieldValues[ii] = fetchKeys.get(ii).condition.getValues().get(0); for (Key<T> key : fetchKeys) {
keyFieldValues[ii ++] = key.condition.getValues().get(0);
} }
condition = new In(_type, _marsh.getPrimaryKeyFields()[0], keyFieldValues); condition = new In(_type, _marsh.getPrimaryKeyFields()[0], keyFieldValues);
} else { } else {
// Multi-column keys result in OR'd AND's, of unknown efficiency (TODO check). // Multi-column keys result in OR'd AND's, of unknown efficiency (TODO check).
SQLExpression[] keyArray = new SQLExpression[fetchKeys.size()]; SQLExpression[] keyArray = new SQLExpression[fetchKeys.size()];
for (int ii = 0; ii < keyArray.length; ii ++) { int ii = 0;
keyArray[ii] = fetchKeys.get(ii).condition; for (Key<T> key : fetchKeys) {
keyArray[ii ++] = key.condition;
} }
condition = new Or(keyArray); condition = new Or(keyArray);
} }