add more tests

Author: aacebo

sqlx/select_test.go

@@ -1,7 +1,6 @@
 package sqlx_test
 
 import (
-	"fmt"
 	"os"
 	"strings"
 	"testing"
@@ -152,8 +151,6 @@ func TestSelect(t *testing.T) {
 			).Sql()
 
 			if sql != strings.TrimSuffix(string(expected), "\n") {
-				fmt.Println(string(expected))
-				fmt.Println(sql)
 				t.Fatalf(sql)
 			}
 		})
@@ -238,8 +235,70 @@ func TestSelect(t *testing.T) {
 				).SqlPretty("    ")
 
 				if sql != strings.TrimSuffix(string(expected), "\n") {
-					fmt.Println(string(expected))
-					fmt.Println(sql)
+					t.Fatalf(sql)
+				}
+			})
+		})
+
+		t.Run("where", func(t *testing.T) {
+			t.Run("and", func(t *testing.T) {
+				expected, err := os.ReadFile("./testcases/select/where_and_pretty.sql")
+
+				if err != nil {
+					t.Fatal(err)
+				}
+
+				sql := sqlx.Select(
+					"a", "b", "c",
+				).From("test").Where(
+					"a = b",
+				).And(
+					"b = c",
+				).SqlPretty("    ")
+
+				if sql != strings.TrimSuffix(string(expected), "\n") {
+					t.Fatalf(sql)
+				}
+			})
+
+			t.Run("or", func(t *testing.T) {
+				expected, err := os.ReadFile("./testcases/select/where_or_pretty.sql")
+
+				if err != nil {
+					t.Fatal(err)
+				}
+
+				sql := sqlx.Select(
+					"a", "b", "c",
+				).From("test").Where(
+					"a = b",
+				).Or(
+					"b = c",
+				).SqlPretty("    ")
+
+				if sql != strings.TrimSuffix(string(expected), "\n") {
+					t.Fatalf(sql)
+				}
+			})
+
+			t.Run("and or", func(t *testing.T) {
+				expected, err := os.ReadFile("./testcases/select/where_and_or_pretty.sql")
+
+				if err != nil {
+					t.Fatal(err)
+				}
+
+				sql := sqlx.Select(
+					"a", "b", "c",
+				).From("test").Where(
+					"c = c",
+				).And(
+					sqlx.Where("a = b").And("b = c"),
+				).And(
+					sqlx.Where("a = b").Or("b = c"),
+				).SqlPretty("    ")
+
+				if sql != strings.TrimSuffix(string(expected), "\n") {
 					t.Fatalf(sql)
 				}
 			})

sqlx/testcases/select/where_and_or_pretty.sql

@@ -0,0 +1,14 @@
+SELECT
+    a,
+    b,
+    c
+FROM test
+WHERE c = c
+AND (
+    a = b
+    AND b = c
+)
+AND (
+    a = b
+    OR b = c
+);

sqlx/testcases/select/where_and_pretty.sql

@@ -0,0 +1,7 @@
+SELECT
+    a,
+    b,
+    c
+FROM test
+WHERE a = b
+AND b = c;

sqlx/testcases/select/where_or_pretty.sql

@@ -0,0 +1,7 @@
+SELECT
+    a,
+    b,
+    c
+FROM test
+WHERE a = b
+OR b = c;

sqlx/where.go

@@ -62,15 +62,20 @@ func (self WhereClause) Sql() string {
 }
 
 func (self WhereClause) SqlPretty(indent string) string {
-	parts := strings.Split(self.predicate.Sql(), "\n")
+	parts := strings.Split(self.predicate.SqlPretty(indent), "\n")
 
 	for _, condition := range self.conditions {
-		parts = append(parts, string(condition.kind)+" "+condition.value.Sql())
+		parts = append(parts, string(condition.kind)+" "+condition.value.SqlPretty(indent))
 	}
 
 	if self.depth > 0 {
+		for i := range parts {
+			parts[i] = indent + parts[i]
+		}
 
+		parts = append([]string{"("}, parts...)
+		parts = append(parts, ")")
 	}
 
-	return strings.Join(parts, " ")
+	return strings.Join(parts, "\n")
 }