Merge pull request #292 from meshery/revert-291-caseInsensitive

Revert "Make searches on Meshmodel entities case insensitive"
meshery · Apr 7, 2023 · 3f37557 · 3f37557
2 parents 8538f40 + 1757340
commit 3f37557
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/models/meshmodel/core/v1alpha1/component.go b/models/meshmodel/core/v1alpha1/component.go
@@ -94,11 +94,11 @@ func GetMeshModelComponents(db *database.Handler, f ComponentFilter) (c []Compon
 		Joins("JOIN category_dbs ON model_dbs.category_id = category_dbs.id") //
 	if f.Greedy {
 		if f.Name != "" && f.DisplayName != "" {
-			finder = finder.Where("component_definition_dbs.kind ILIKE ? OR display_name ILIKE ?", "%"+f.Name+"%", f.DisplayName+"%")
+			finder = finder.Where("component_definition_dbs.kind LIKE ? OR display_name LIKE ?", "%"+f.Name+"%", f.DisplayName+"%")
 		} else if f.Name != "" {
-			finder = finder.Where("component_definition_dbs.kind ILIKE ?", "%"+f.Name+"%")
+			finder = finder.Where("component_definition_dbs.kind LIKE ?", "%"+f.Name+"%")
 		} else if f.DisplayName != "" {
-			finder = finder.Where("component_definition_dbs.display_name ILIKE ?", "%"+f.DisplayName+"%")
+			finder = finder.Where("component_definition_dbs.display_name LIKE ?", "%"+f.DisplayName+"%")
 		}
 	} else {
 		if f.Name != "" {

diff --git a/models/meshmodel/core/v1alpha1/relationship.go b/models/meshmodel/core/v1alpha1/relationship.go
@@ -71,7 +71,7 @@ func GetMeshModelRelationship(db *database.Handler, f RelationshipFilter) (r []R
 		Joins("JOIN category_dbs ON model_dbs.category_id = category_dbs.id")           //
 	if f.Kind != "" {
 		if f.Greedy {
-			finder = finder.Where("relationship_definition_dbs.kind ILIKE ?", "%"+f.Kind+"%")
+			finder = finder.Where("relationship_definition_dbs.kind LIKE ?", "%"+f.Kind+"%")
 		} else {
 			finder = finder.Where("relationship_definition_dbs.kind = ?", "%"+f.Kind+"%")
 		}

diff --git a/models/meshmodel/registry.go b/models/meshmodel/registry.go
@@ -198,11 +198,11 @@ func (rm *RegistryManager) GetModels(db *database.Handler, f types.Filter) []v1a
 	if mf, ok := f.(*v1alpha1.ModelFilter); ok {
 		if mf.Greedy {
 			if mf.Name != "" && mf.DisplayName != "" {
-				finder = finder.Where("model_dbs.name ILIKE ? OR model_dbs.display_name ILIKE ?", "%"+mf.Name+"%", "%"+mf.DisplayName+"%")
+				finder = finder.Where("model_dbs.name LIKE ? OR model_dbs.display_name LIKE ?", "%"+mf.Name+"%", "%"+mf.DisplayName+"%")
 			} else if mf.Name != "" {
-				finder = finder.Where("model_dbs.name ILIKE ?", "%"+mf.Name+"%")
+				finder = finder.Where("model_dbs.name LIKE ?", "%"+mf.Name+"%")
 			} else if mf.DisplayName != "" {
-				finder = finder.Where("model_dbs.display_name ILIKE ?", "%"+mf.DisplayName+"%")
+				finder = finder.Where("model_dbs.display_name LIKE ?", "%"+mf.DisplayName+"%")
 			}
 		} else {
 			if mf.Name != "" {
@@ -250,7 +250,7 @@ func (rm *RegistryManager) GetCategories(db *database.Handler, f types.Filter) [
 	if mf, ok := f.(*v1alpha1.CategoryFilter); ok {
 		if mf.Name != "" {
 			if mf.Greedy {
-				finder = finder.Where("name ILIKE ?", "%"+mf.Name+"%")
+				finder = finder.Where("name LIKE ?", "%"+mf.Name+"%")
 			} else {
 				finder = finder.Where("name = ?", mf.Name)
 			}