Raw join duplication prevention handle 'AS' keyword

go-goyave · Aug 2, 2022 · 70465fd · 70465fd
1 parent a4fb56e
commit 70465fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/filter_test.go b/filter_test.go
@@ -426,7 +426,7 @@ func TestFilterScopeWithAlreadyExistingRawJoin(t *testing.T) {
 
 	// We manually join a relation with a condition.
 	// We expect this join to not be removed nor duplicated, with the condition kept.
-	db = db.Joins(`LEFT JOIN filter_test_relations "Relation" ON id > ?`, 0)
+	db = db.Joins(`LEFT JOIN filter_test_relations AS "Relation" ON id > ?`, 0)
 
 	db = db.Model(&results).Scopes(filter.Scope(&Settings{}, schema)).Find(&results)
 	expected := map[string]clause.Clause{

diff --git a/join.go b/join.go
@@ -13,7 +13,7 @@ import (
 )
 
 var (
-	joinRegex = regexp.MustCompile("(?i)((LEFT|RIGHT|FULL)\\s+)?((OUTER|INNER)\\s+)?JOIN\\s+[\"'`]?(?P<TableName>\\w+)[\"'`]?\\s+([\"'`]?(?P<Alias>\\w+)[\"'`]?)?\\s*ON")
+	joinRegex = regexp.MustCompile("(?i)((LEFT|RIGHT|FULL)\\s+)?((OUTER|INNER)\\s+)?JOIN\\s+[\"'`]?(?P<TableName>\\w+)[\"'`]?\\s+((AS\\s+)?[\"'`]?(?P<Alias>\\w+)[\"'`]?)?\\s*ON")
 )
 
 // Join structured representation of a join query.