|
@@ -43,8 +43,8 @@ public abstract class Table<T extends Persistable> {
|
|
return list;
|
|
return list;
|
|
}
|
|
}
|
|
|
|
|
|
- public List<T> getWhere(List<String> where, List<Object> params) {
|
|
|
|
- List<T> list = getWhereFromDb(where, params);
|
|
|
|
|
|
+ public List<T> getWhere(List<String> fields, List<Object> values) {
|
|
|
|
+ List<T> list = getWhereFromDb(fields, values);
|
|
list.forEach(elt -> cache(elt));
|
|
list.forEach(elt -> cache(elt));
|
|
return list;
|
|
return list;
|
|
}
|
|
}
|
|
@@ -213,12 +213,12 @@ public abstract class Table<T extends Persistable> {
|
|
return result.get();
|
|
return result.get();
|
|
}
|
|
}
|
|
|
|
|
|
- private List<T> getWhereFromDb(List<String> fields, List<Object> params) {
|
|
|
|
|
|
+ private List<T> getWhereFromDb(List<String> where, List<Object> params) {
|
|
DbTable dbTable = getDbTableAnnotation();
|
|
DbTable dbTable = getDbTableAnnotation();
|
|
// Requete sql
|
|
// Requete sql
|
|
StringBuilder sql = new StringBuilder();
|
|
StringBuilder sql = new StringBuilder();
|
|
sql.append("Select * From " + dbTable.name() + "Where 1=1");
|
|
sql.append("Select * From " + dbTable.name() + "Where 1=1");
|
|
- fields.forEach(elt -> sql.append(" And elt = ?"));
|
|
|
|
|
|
+ where.forEach(elt -> sql.append(" And " + elt + " = ?"));
|
|
// Execution requete
|
|
// Execution requete
|
|
Optional<List<T>> result = Database.query(sql.toString(), params, rs -> {
|
|
Optional<List<T>> result = Database.query(sql.toString(), params, rs -> {
|
|
try {
|
|
try {
|