Skip to content

The Unified and Autonomous Development Platform

Perform case insensitive queries for unique entities to avoid database switching issues

Robin Shenc62e23d3a942
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
index eeeee15838..6fc73e3173 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
@@ -102,7 +102,7 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implements
@Override
public Group find(String name) {
EntityCriteria<Group> criteria = newCriteria();
- criteria.add(Restrictions.eq("name", name));
+ criteria.add(Restrictions.ilike("name", name));
criteria.setCacheable(true);
return find(criteria);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
index 5de7265073..7ab37f330f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
@@ -55,7 +55,7 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im
public Milestone find(Project project, String name) {
EntityCriteria<Milestone> criteria = EntityCriteria.of(Milestone.class);
criteria.add(Restrictions.eq("project", project));
- criteria.add(Restrictions.eq("name", name));
+ criteria.add(Restrictions.ilike("name", name));
criteria.setCacheable(true);
return find(criteria);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 06c8eab548..54c9fe548e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -275,7 +275,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>
@Override
public Project find(String projectName) {
EntityCriteria<Project> criteria = newCriteria();
- criteria.add(Restrictions.eq("name", projectName));
+ criteria.add(Restrictions.ilike("name", projectName));
criteria.setCacheable(true);
return find(criteria);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
index 650febe065..690ffe9e67 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
@@ -87,7 +87,7 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements R
@Override
public Role find(String name) {
EntityCriteria<Role> criteria = newCriteria();
- criteria.add(Restrictions.eq("name", name));
+ criteria.add(Restrictions.ilike("name", name));
criteria.setCacheable(true);
return dao.find(criteria);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index d24549b2cb..162b61fac6 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -219,7 +219,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
@Override
public User findByName(String userName) {
EntityCriteria<User> criteria = newCriteria();
- criteria.add(Restrictions.eq(User.PROP_NAME, userName));
+ criteria.add(Restrictions.ilike(User.PROP_NAME, userName));
criteria.setCacheable(true);
return find(criteria);
}
@@ -260,7 +260,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
@Override
public User findByEmail(String email) {
EntityCriteria<User> criteria = newCriteria();
- criteria.add(Restrictions.eq(User.PROP_EMAIL, email));
+ criteria.add(Restrictions.ilike(User.PROP_EMAIL, email));
criteria.setCacheable(true);
return find(criteria);
}