fix: table name case sensitivity in join and pattern statement (#1314)

* fix: table name case sensitivity in join and pattern statement * fix: a unit test error
KusionStack · Nov 13, 2024 · 210ef29 · 210ef29
1 parent ec0231b
commit 210ef29
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/pkg/infra/persistence/resource.go b/pkg/infra/persistence/resource.go
@@ -110,8 +110,8 @@ func (r *resourceRepository) Get(ctx context.Context, id uint) (*entity.Resource
 	var dataModel ResourceModel
 	err := r.db.WithContext(ctx).
 		Preload("Stack").Preload("Stack.Project").Preload("Stack.Project.Organization").Preload("Stack.Project.Source").
-		Joins("JOIN Stack ON Stack.id = Resource.stack_id").
-		Joins("JOIN Project ON Project.id = Stack.project_id").
+		Joins("JOIN stack ON stack.id = resource.stack_id").
+		Joins("JOIN project ON project.id = stack.project_id").
 		First(&dataModel, id).Error
 	if err != nil {
 		return nil, err
@@ -125,8 +125,8 @@ func (r *resourceRepository) GetByKusionResourceID(ctx context.Context, id strin
 	var dataModel ResourceModel
 	err := r.db.WithContext(ctx).
 		Preload("Stack").Preload("Stack.Project").Preload("Stack.Project.Organization").Preload("Stack.Project.Source").
-		Joins("JOIN Stack ON Stack.id = Resource.stack_id").
-		Joins("JOIN Project ON Project.id = Stack.project_id").
+		Joins("JOIN stack ON stack.id = resource.stack_id").
+		Joins("JOIN project ON project.id = stack.project_id").
 		Where("kusion_resource_id = ?", id).
 		First(&dataModel).Error
 	if err != nil {
@@ -142,8 +142,8 @@ func (r *resourceRepository) List(ctx context.Context, filter *entity.ResourceFi
 	pattern, args := GetResourceQuery(filter)
 	result := r.db.WithContext(ctx).
 		Preload("Stack").Preload("Stack.Project").Preload("Stack.Project.Organization").Preload("Stack.Project.Source").
-		Joins("JOIN Stack ON Stack.id = Resource.stack_id").
-		Joins("JOIN Project ON Project.id = Stack.project_id").
+		Joins("JOIN stack ON stack.id = resource.stack_id").
+		Joins("JOIN project ON project.id = stack.project_id").
 		Where(pattern, args...).
 		Find(&dataModel)
 	if result.Error != nil {

diff --git a/pkg/infra/persistence/run.go b/pkg/infra/persistence/run.go
@@ -86,8 +86,8 @@ func (r *runRepository) Get(ctx context.Context, id uint) (*entity.Run, error) {
 	var dataModel RunModel
 	err := r.db.WithContext(ctx).
 		Preload("Stack").Preload("Stack.Project").
-		Joins("JOIN Stack ON Stack.id = Run.stack_id").
-		Joins("JOIN Project ON Project.id = Stack.project_id").
+		Joins("JOIN stack ON stack.id = run.stack_id").
+		Joins("JOIN project ON project.id = stack.project_id").
 		First(&dataModel, id).Error
 	if err != nil {
 		return nil, err
@@ -102,9 +102,9 @@ func (r *runRepository) List(ctx context.Context, filter *entity.RunFilter) ([]*
 	pattern, args := GetRunQuery(filter)
 	result := r.db.WithContext(ctx).
 		Preload("Stack").Preload("Stack.Project").
-		Joins("JOIN Stack ON Stack.id = Run.stack_id").
-		Joins("JOIN Project ON Project.id = Stack.project_id").
-		Joins("JOIN Workspace ON Workspace.name = Run.workspace").
+		Joins("JOIN stack ON stack.id = run.stack_id").
+		Joins("JOIN project ON project.id = stack.project_id").
+		Joins("JOIN workspace ON workspace.name = run.workspace").
 		Where(pattern, args...).
 		Find(&dataModel)
 	if result.Error != nil {

diff --git a/pkg/infra/persistence/stack.go b/pkg/infra/persistence/stack.go
@@ -88,7 +88,7 @@ func (r *stackRepository) Get(ctx context.Context, id uint) (*entity.Stack, erro
 	var dataModel StackModel
 	err := r.db.WithContext(ctx).
 		Preload("Project").Preload("Project.Organization").Preload("Project.Source").
-		Joins("JOIN Project ON Project.id = Stack.project_id").
+		Joins("JOIN project ON project.id = stack.project_id").
 		First(&dataModel, id).Error
 	if err != nil {
 		return nil, err
@@ -104,7 +104,7 @@ func (r *stackRepository) List(ctx context.Context, filter *entity.StackFilter)
 	pattern, args := GetStackQuery(filter)
 	result := r.db.WithContext(ctx).
 		Preload("Project").Preload("Project.Organization").Preload("Project.Source").
-		Joins("JOIN Project ON Project.id = Stack.project_id").
+		Joins("JOIN project ON project.id = stack.project_id").
 		Where(pattern, args...).
 		Find(&dataModel)
 	if result.Error != nil {

diff --git a/pkg/infra/persistence/util.go b/pkg/infra/persistence/util.go
@@ -107,15 +107,15 @@ func GetStackQuery(filter *entity.StackFilter) (string, []interface{}) {
 	pattern := make([]string, 0)
 	args := make([]interface{}, 0)
 	if filter.OrgID != 0 {
-		pattern = append(pattern, "Project.organization_id = ?")
+		pattern = append(pattern, "project.organization_id = ?")
 		args = append(args, fmt.Sprint(filter.OrgID))
 	}
 	if filter.ProjectID != 0 {
 		pattern = append(pattern, "project_id = ?")
 		args = append(args, fmt.Sprint(filter.ProjectID))
 	}
 	if filter.Path != "" {
-		pattern = append(pattern, "Stack.path = ?")
+		pattern = append(pattern, "stack.path = ?")
 		args = append(args, filter.Path)
 	}
 	return CombineQueryParts(pattern), args
@@ -165,15 +165,15 @@ func GetRunQuery(filter *entity.RunFilter) (string, []interface{}) {
 	pattern := make([]string, 0)
 	args := make([]interface{}, 0)
 	if filter.ProjectID != 0 {
-		pattern = append(pattern, "Project.ID = ?")
+		pattern = append(pattern, "project.ID = ?")
 		args = append(args, fmt.Sprint(filter.ProjectID))
 	}
 	if filter.StackID != 0 {
 		pattern = append(pattern, "stack_id = ?")
 		args = append(args, filter.StackID)
 	}
 	if filter.Workspace != "" {
-		pattern = append(pattern, "Workspace.name = ?")
+		pattern = append(pattern, "workspace.name = ?")
 		args = append(args, filter.Workspace)
 	}
 	return CombineQueryParts(pattern), args

diff --git a/pkg/infra/persistence/util_test.go b/pkg/infra/persistence/util_test.go
@@ -110,7 +110,7 @@ func TestGetStackQuery(t *testing.T) {
 			filter: &entity.StackFilter{
 				OrgID: 42,
 			},
-			expectedQuery: "Project.organization_id = ?",
+			expectedQuery: "project.organization_id = ?",
 			expectedArgs:  []interface{}{"42"},
 		},
 		{
@@ -126,7 +126,7 @@ func TestGetStackQuery(t *testing.T) {
 			filter: &entity.StackFilter{
 				Path: "example",
 			},
-			expectedQuery: "Stack.path = ?",
+			expectedQuery: "stack.path = ?",
 			expectedArgs:  []interface{}{"example"},
 		},
 		{
@@ -136,7 +136,7 @@ func TestGetStackQuery(t *testing.T) {
 				ProjectID: 1,
 				Path:      "example",
 			},
-			expectedQuery: "Project.organization_id = ? AND project_id = ? AND Stack.path = ?",
+			expectedQuery: "project.organization_id = ? AND project_id = ? AND stack.path = ?",
 			expectedArgs:  []interface{}{"42", "1", "example"},
 		},
 	}