添加group by和order by

framework/core/infrastructure/database/clause/condition.go

@@ -26,7 +26,7 @@ func (conditions *Conditions) Equal(columnName string, arg any) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" = ?")
+	conditions.queries = append(conditions.queries, columnName+" = ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -36,7 +36,7 @@ func (conditions *Conditions) Like(columnName string, arg string) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" LIKE ?")
+	conditions.queries = append(conditions.queries, columnName+" LIKE ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -46,7 +46,7 @@ func (conditions *Conditions) In(columnName string, arg any) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" IN ?")
+	conditions.queries = append(conditions.queries, columnName+" IN ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -56,7 +56,7 @@ func (conditions *Conditions) NotIn(columnName string, arg any) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" NOT IN ?")
+	conditions.queries = append(conditions.queries, columnName+" NOT IN ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -66,7 +66,7 @@ func (conditions *Conditions) Not(columnName string, arg any) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" != ?")
+	conditions.queries = append(conditions.queries, columnName+" != ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -76,7 +76,7 @@ func (conditions *Conditions) LessThan(columnName string, arg any) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" < ?")
+	conditions.queries = append(conditions.queries, columnName+" < ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -86,7 +86,7 @@ func (conditions *Conditions) LessThanAndEqual(columnName string, arg any) *Cond
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" <= ?")
+	conditions.queries = append(conditions.queries, columnName+" <= ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -96,7 +96,7 @@ func (conditions *Conditions) GreaterThan(columnName string, arg any) *Condition
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" > ?")
+	conditions.queries = append(conditions.queries, columnName+" > ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -106,7 +106,7 @@ func (conditions *Conditions) GreaterThanAndEqual(columnName string, arg any) *C
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" >= ?")
+	conditions.queries = append(conditions.queries, columnName+" >= ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }

framework/core/infrastructure/database/clause/group_by.go

@@ -0,0 +1,19 @@
+package clause
+
+type GroupBy struct {
+	columnName string
+}
+
+func NewGroupBy(columnName string) *GroupBy {
+	return &GroupBy{
+		columnName: columnName,
+	}
+}
+
+func (clause *GroupBy) Clause() (string, error) {
+	return "GROUP BY " + clause.columnName + "\n", nil
+}
+
+func (clause *GroupBy) Args() []any {
+	return make([]any, 0)
+}

framework/core/infrastructure/database/sql/conditions.go

@@ -40,7 +40,7 @@ func (conditions *Conditions) Equal(columnName string, arg any) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" = ?")
+	conditions.queries = append(conditions.queries, columnName+" = ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -56,7 +56,7 @@ func (conditions *Conditions) Like(columnName string, arg string) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" LIKE ?")
+	conditions.queries = append(conditions.queries, columnName+" LIKE ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -72,7 +72,7 @@ func (conditions *Conditions) In(columnName string, arg any) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" IN ?")
+	conditions.queries = append(conditions.queries, columnName+" IN ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -88,7 +88,7 @@ func (conditions *Conditions) NotIn(columnName string, arg any) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" NOT IN ?")
+	conditions.queries = append(conditions.queries, columnName+" NOT IN ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -104,7 +104,7 @@ func (conditions *Conditions) Not(columnName string, arg any) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" != ?")
+	conditions.queries = append(conditions.queries, columnName+" != ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -120,7 +120,7 @@ func (conditions *Conditions) LessThan(columnName string, arg any) *Conditions {
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" < ?")
+	conditions.queries = append(conditions.queries, columnName+" < ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -136,7 +136,7 @@ func (conditions *Conditions) LessThanAndEqual(columnName string, arg any) *Cond
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" <= ?")
+	conditions.queries = append(conditions.queries, columnName+" <= ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -152,7 +152,7 @@ func (conditions *Conditions) GreaterThan(columnName string, arg any) *Condition
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" > ?")
+	conditions.queries = append(conditions.queries, columnName+" > ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }
@@ -168,7 +168,7 @@ func (conditions *Conditions) GreaterThanAndEqual(columnName string, arg any) *C
 		return conditions
 	}
 
-	conditions.queries = append(conditions.queries, "\""+columnName+"\" >= ?")
+	conditions.queries = append(conditions.queries, columnName+" >= ?")
 	conditions.args = append(conditions.args, []any{arg})
 	return conditions
 }