Fix JoinAssoc field escape and add spec (#36)

* Fix JoinAssoc field escape and add spec

* Update query.go

* fix dep

* add wait for replication

* support older testify

* Downgrade testify to v1.7.1

* Bump rel

Author: Fs02

builder/buffer.go

@@ -146,7 +146,7 @@ func (b Buffer) escape(table, value string) string {
 	} else if _, err := strconv.Atoi(value); err == nil {
 		escapedValue = value
 	} else if i := strings.Index(strings.ToLower(value), " as "); i > -1 {
-		escapedValue = b.escape(table, value[:i]) + " AS " + b.escape("", value[i+4:])
+		escapedValue = b.escape(table, value[:i]) + " AS " + b.Quoter.ID(value[i+4:])
 	} else if start, end := strings.IndexRune(value, '('), strings.IndexRune(value, ')'); start >= 0 && end >= 0 && end > start {
 		escapedValue = value[:start+1] + b.escape(table, value[start+1:end]) + value[end:]
 	} else {

builder/buffer_test.go

@@ -62,6 +62,11 @@ func TestBuffer_escape(t *testing.T) {
 			field:  "person.address as home_address",
 			result: "[person].[address] AS [home_address]",
 		},
+		{
+			table:  "user",
+			field:  "person.address as person.address",
+			result: "[person].[address] AS [person.address]",
+		},
 	}
 	for _, test := range tests {
 		t.Run(test.result, func(t *testing.T) {

go.mod

@@ -3,6 +3,6 @@ module github.com/go-rel/sql
 go 1.16
 
 require (
-	github.com/go-rel/rel v0.36.0
+	github.com/go-rel/rel v0.37.0
 	github.com/stretchr/testify v1.8.0
 )

go.sum

@@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/go-rel/rel v0.36.0 h1:GgKB+0btoZVQ+6YBboPJvRksNtbMJOTv+iMO79t+QMo=
-github.com/go-rel/rel v0.36.0/go.mod h1:SHjO9VOInj8GD2cTVWmTnOS+rj5IJZoDy8LEyd5oDUQ=
+github.com/go-rel/rel v0.37.0 h1:9Ca1u0E6tu3hZGbzgpk6VxQI8b50JV7AeTi+v5Q/1jU=
+github.com/go-rel/rel v0.37.0/go.mod h1:Zq18pQqXZbDh2JBCo29jgt+y90nZWkUvI+W9Ls29ans=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -37,7 +37,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo=

specs/query.go

@@ -84,6 +84,30 @@ func QueryJoin(t *testing.T, repo rel.Repository) {
 	run(t, repo, tests)
 }
 
+// QueryJoinAssoc tests query specifications with join.
+func QueryJoinAssoc(t *testing.T, repo rel.Repository) {
+	dbUser := User{Addresses: []Address{{}}}
+	repo.MustInsert(ctx, &dbUser)
+
+	waitForReplication()
+
+	t.Run("HasMany", func(t *testing.T) {
+		assert.Nil(t, repo.Find(ctx, &User{}, rel.JoinAssoc("addresses").Where(where.Eq("id", dbUser.ID))))
+	})
+
+	t.Run("HasOne", func(t *testing.T) {
+		var user User
+		assert.Nil(t, repo.Find(ctx, &user, rel.Select("*", "primary_address.*").JoinAssoc("primary_address").Where(where.Eq("id", dbUser.ID))))
+		assert.Equal(t, dbUser.Addresses[0].ID, user.PrimaryAddress.ID)
+	})
+
+	t.Run("BelongsTo", func(t *testing.T) {
+		var address Address
+		assert.Nil(t, repo.Find(ctx, &address, rel.Select("*", "user.*").JoinAssoc("user").Where(where.Eq("id", dbUser.Addresses[0].ID))))
+		assert.Equal(t, dbUser.ID, address.User.ID)
+	})
+}
+
 // Query tests query specifications without join.
 func QueryWhereSubQuery(t *testing.T, repo rel.Repository, flags ...Flag) {
 	tests := []rel.Querier{