From 954247036a512aebe8786d5dcffe68d1935cf25d Mon Sep 17 00:00:00 2001
From: leiwingqueen <leiwingqueen@gmail.com>
Date: Fri, 1 Mar 2024 17:22:07 +0800
Subject: [PATCH] order by function support empty value

---
 internal/statements/order_by.go | 25 ++++++++++++++-----------
 tests/types_null_test.go        | 15 +++++++++++++++
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/internal/statements/order_by.go b/internal/statements/order_by.go
index a527630d..0e1d985c 100644
--- a/internal/statements/order_by.go
+++ b/internal/statements/order_by.go
@@ -17,23 +17,23 @@ type orderBy struct {
 	direction string // ASC, DESC or "", "" means raw orderStr
 }
 
-func (ob orderBy) CheckValid() error {
+func (ob orderBy) CheckValid() (bool, error) {
 	if ob.orderStr == nil {
-		return fmt.Errorf("order by string is nil")
+		return false, nil
 	}
 	switch t := ob.orderStr.(type) {
 	case string:
 		if t == "" {
-			return fmt.Errorf("order by string is empty")
+			return false, nil
 		}
-		return nil
+		return true, nil
 	case *builder.Expression:
 		if t.Content() == "" {
-			return fmt.Errorf("order by string is empty")
+			return false, nil
 		}
-		return nil
+		return true, nil
 	default:
-		return fmt.Errorf("order by string is not string or builder.Expression")
+		return false, fmt.Errorf("order by string is not string or builder.Expression")
 	}
 }
 
@@ -99,11 +99,14 @@ func (statement *Statement) writeOrderBys(w *builder.BytesWriter) error {
 // OrderBy generate "Order By order" statement
 func (statement *Statement) OrderBy(order any, args ...any) *Statement {
 	ob := orderBy{order, args, ""}
-	if err := ob.CheckValid(); err != nil {
+	notNil, err := ob.CheckValid()
+	if err != nil {
 		statement.LastError = err
 		return statement
 	}
-	statement.orderBy = append(statement.orderBy, ob)
+	if notNil {
+		statement.orderBy = append(statement.orderBy, ob)
+	}
 	return statement
 }
 
@@ -116,7 +119,7 @@ func (statement *Statement) Desc(colNames ...string) *Statement {
 	for _, colName := range colNames {
 		ob := orderBy{colName, nil, "DESC"}
 		statement.orderBy = append(statement.orderBy, ob)
-		if err := ob.CheckValid(); err != nil {
+		if _, err := ob.CheckValid(); err != nil {
 			statement.LastError = err
 			return statement
 		}
@@ -133,7 +136,7 @@ func (statement *Statement) Asc(colNames ...string) *Statement {
 	for _, colName := range colNames {
 		ob := orderBy{colName, nil, "ASC"}
 		statement.orderBy = append(statement.orderBy, ob)
-		if err := ob.CheckValid(); err != nil {
+		if _, err := ob.CheckValid(); err != nil {
 			statement.LastError = err
 			return statement
 		}
diff --git a/tests/types_null_test.go b/tests/types_null_test.go
index c407a5f8..2b05ebcd 100644
--- a/tests/types_null_test.go
+++ b/tests/types_null_test.go
@@ -270,6 +270,21 @@ func TestNullStructIterate(t *testing.T) {
 	}
 }
 
+func TestNullOrderBy(t *testing.T) {
+	assert.NoError(t, PrepareEngine())
+	assertSync(t, new(NullStruct))
+
+	if true {
+		err := testEngine.Where("`age` IS NOT NULL").OrderBy("").Iterate(new(NullStruct),
+			func(i int, bean any) error {
+				nultype := bean.(*NullStruct)
+				fmt.Println(i, nultype)
+				return nil
+			})
+		assert.NoError(t, err)
+	}
+}
+
 func TestNullStructCount(t *testing.T) {
 	assert.NoError(t, PrepareEngine())
 	assertSync(t, new(NullStruct))