base join

thegogod · Nov 22, 2024 · 3a11beb · 3a11beb
1 parent 5704917
commit 3a11beb
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 0 deletions.
diff --git a/sqlx/join.go b/sqlx/join.go
@@ -11,6 +11,10 @@ type JoinClause struct {
 	where  *WhereClause
 }
 
+func Join(table string, predicate any) *JoinClause {
+	return &JoinClause{nil, table, Where(predicate)}
+}
+
 func LeftJoin(table string, predicate any) *JoinClause {
 	method := "LEFT"
 	return &JoinClause{&method, table, Where(predicate)}

diff --git a/sqlx/select_test.go b/sqlx/select_test.go
@@ -167,6 +167,22 @@ func TestSelect(t *testing.T) {
 	})
 
 	t.Run("join", func(t *testing.T) {
+		t.Run("join", func(t *testing.T) {
+			expected, err := os.ReadFile("./testcases/select/join.sql")
+
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			sql := sqlx.Select("*").From("a").Join(
+				sqlx.Join("b", "a.id = b.id").And("b.deleted_at IS NULL"),
+			).Sql()
+
+			if sql != strings.TrimSuffix(string(expected), "\n") {
+				t.Fatalf(sql)
+			}
+		})
+
 		t.Run("left", func(t *testing.T) {
 			expected, err := os.ReadFile("./testcases/select/left_join.sql")
 
@@ -434,6 +450,22 @@ func TestSelect(t *testing.T) {
 		})
 
 		t.Run("join", func(t *testing.T) {
+			t.Run("join", func(t *testing.T) {
+				expected, err := os.ReadFile("./testcases/select/join_pretty.sql")
+
+				if err != nil {
+					t.Fatal(err)
+				}
+
+				sql := sqlx.Select("*").From("a").Join(
+					sqlx.Join("b", "a.id = b.id").And("b.deleted_at IS NULL"),
+				).SqlPretty("    ")
+
+				if sql != strings.TrimSuffix(string(expected), "\n") {
+					t.Fatalf(sql)
+				}
+			})
+
 			t.Run("left", func(t *testing.T) {
 				expected, err := os.ReadFile("./testcases/select/left_join_pretty.sql")
 

diff --git a/sqlx/testcases/select/join.sql b/sqlx/testcases/select/join.sql
@@ -0,0 +1 @@
+SELECT * FROM a JOIN b ON a.id = b.id AND b.deleted_at IS NULL;
diff --git a/sqlx/testcases/select/join_pretty.sql b/sqlx/testcases/select/join_pretty.sql
@@ -0,0 +1,6 @@
+SELECT
+    *
+FROM a
+JOIN b
+    ON a.id = b.id
+    AND b.deleted_at IS NULL;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		SELECT * FROM a JOIN b ON a.id = b.id AND b.deleted_at IS NULL;