Browse Source

Removed all case sensitivity when searching names.

pull/118/head
CalDescent 1 year ago
parent
commit
f045e10ada
  1. 12
      src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java

12
src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java

@ -452,12 +452,12 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
// Handle name exact matches // Handle name exact matches
if (exactMatchNames != null && !exactMatchNames.isEmpty()) { if (exactMatchNames != null && !exactMatchNames.isEmpty()) {
sql.append(" AND name IN (?"); sql.append(" AND LCASE(name) IN (?");
bindParams.add(exactMatchNames.get(0)); bindParams.add(exactMatchNames.get(0));
for (int i = 1; i < exactMatchNames.size(); ++i) { for (int i = 1; i < exactMatchNames.size(); ++i) {
sql.append(", ?"); sql.append(", ?");
bindParams.add(exactMatchNames.get(i)); bindParams.add(exactMatchNames.get(i).toLowerCase());
} }
sql.append(")"); sql.append(")");
} }
@ -466,12 +466,12 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
if (followedOnly != null && followedOnly) { if (followedOnly != null && followedOnly) {
List<String> followedNames = ListUtils.followedNames(); List<String> followedNames = ListUtils.followedNames();
if (followedNames != null && !followedNames.isEmpty()) { if (followedNames != null && !followedNames.isEmpty()) {
sql.append(" AND name IN (?"); sql.append(" AND LCASE(name) IN (?");
bindParams.add(followedNames.get(0)); bindParams.add(followedNames.get(0));
for (int i = 1; i < followedNames.size(); ++i) { for (int i = 1; i < followedNames.size(); ++i) {
sql.append(", ?"); sql.append(", ?");
bindParams.add(followedNames.get(i)); bindParams.add(followedNames.get(i).toLowerCase());
} }
sql.append(")"); sql.append(")");
} }
@ -481,12 +481,12 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
if (excludeBlocked != null && excludeBlocked) { if (excludeBlocked != null && excludeBlocked) {
List<String> blockedNames = ListUtils.blockedNames(); List<String> blockedNames = ListUtils.blockedNames();
if (blockedNames != null && !blockedNames.isEmpty()) { if (blockedNames != null && !blockedNames.isEmpty()) {
sql.append(" AND name NOT IN (?"); sql.append(" AND LCASE(name) NOT IN (?");
bindParams.add(blockedNames.get(0)); bindParams.add(blockedNames.get(0));
for (int i = 1; i < blockedNames.size(); ++i) { for (int i = 1; i < blockedNames.size(); ++i) {
sql.append(", ?"); sql.append(", ?");
bindParams.add(blockedNames.get(i)); bindParams.add(blockedNames.get(i).toLowerCase());
} }
sql.append(")"); sql.append(")");
} }

Loading…
Cancel
Save