fix: ORDER BY clause position is incorrect (#33)

query/query.go

@@ -92,9 +92,9 @@ type Select struct {
 	Columns   []string
 	From      string
 	Where     Condition
+	OrderBy   string
 	Limit     int
 	Offset    int
-	OrderBy   string
 	ForUpdate bool
 }
 
@@ -137,9 +137,9 @@ type Update struct {
 	Table   string
 	Set     map[string]any
 	Where   Condition
+	OrderBy string
 	Limit   int
 	Offset  int
-	OrderBy string
 }
 
 func (q Update) Validate() error {
@@ -183,9 +183,9 @@ func (q Update) Query() (string, []any, error) {
 type Delete struct {
 	From    string
 	Where   Condition
+	OrderBy string
 	Limit   int
 	Offset  int
-	OrderBy string
 }
 
 func (d Delete) Validate() error {

query/query_test.go

@@ -61,7 +61,7 @@ func TestQueryBuilder(t *testing.T) {
 				OrderBy:   "id DESC",
 				ForUpdate: true,
 			},
-			stmt: "SELECT `id`,`age` FROM `table` WHERE id = ? LIMIT ? OFFSET ? ORDER BY id DESC FOR UPDATE",
+			stmt: "SELECT `id`,`age` FROM `table` WHERE id = ? ORDER BY id DESC LIMIT ? OFFSET ? FOR UPDATE",
 			args: []any{1, 2, 3},
 		},
 		{
@@ -82,18 +82,24 @@ func TestQueryBuilder(t *testing.T) {
 					"id":   1,
 					"name": "go",
 				},
-				Where: NewCondition(`id = ?`, 2),
+				Where:   NewCondition(`id = ?`, 2),
+				OrderBy: "id",
+				Limit:   3,
+				Offset:  4,
 			},
-			stmt: "UPDATE `table` SET `id` = ?,`name` = ? WHERE id = ?",
-			args: []any{1, "go", 2},
+			stmt: "UPDATE `table` SET `id` = ?,`name` = ? WHERE id = ? ORDER BY id LIMIT ? OFFSET ?",
+			args: []any{1, "go", 2, 3, 4},
 		},
 		{
 			query: Delete{
-				From:  "table",
-				Where: NewCondition(`id = ?`, 1),
+				From:    "table",
+				Where:   NewCondition(`id = ?`, 1),
+				OrderBy: "id",
+				Limit:   2,
+				Offset:  3,
 			},
-			stmt: "DELETE FROM `table` WHERE id = ?",
-			args: []any{1},
+			stmt: "DELETE FROM `table` WHERE id = ? ORDER BY id LIMIT ? OFFSET ?",
+			args: []any{1, 2, 3},
 		},
 	}
 	for _, v := range arr {