[FIX] Fix fieldset parameter resolution.

Author: shellyln

soql/parser/parser_test.go

@@ -61,11 +61,10 @@ func TestParse(t *testing.T) {
 		want:    nil,
 		wantErr: false,
 	}, {
-		name:     "co-related subquery 1",
-		args:     args{s: `SELECT (SELECT Id FROM con.Departments where contact=contact.id) qwerty FROM Contact con`},
-		want:     nil,
-		wantErr:  false,
-		dbgBreak: true,
+		name:    "co-related subquery 1",
+		args:    args{s: `SELECT (SELECT Id FROM con.Departments where contact=contact.id) qwerty FROM Contact con`},
+		want:    nil,
+		wantErr: false,
 	}, {
 		name:    "co-related subquery 2",
 		args:    args{s: `SELECT (SELECT Id FROM con.Departments where contact=con.id) qwerty FROM Contact con`},
@@ -76,6 +75,17 @@ func TestParse(t *testing.T) {
 		args:    args{s: `SELECT (SELECT Id, con.Id FROM con.Departments) qwerty FROM Contact con`},
 		want:    nil,
 		wantErr: true,
+	}, {
+		name:    "fieldset 1",
+		args:    args{s: `SELECT fields(acc.all) FROM Contact con, con.Account acc`},
+		want:    nil,
+		wantErr: false,
+	}, {
+		name:     "fieldset 2",
+		args:     args{s: `SELECT fields(con.acc.all) FROM Contact con, con.Account acc`},
+		want:     nil,
+		wantErr:  true,
+		dbgBreak: true,
 	}}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

soql/parser/postprocess/normalize1.go

@@ -209,6 +209,21 @@ func (ctx *normalizeQueryContext) normalizeFieldName(
 
 				qualifyName()
 
+				key := nameutil.MakeDottedKeyIgnoreCase(field.Name, len(field.Name)-1)
+				fullyQualifiedName, ok := objNameMap[key]
+
+				if !ok {
+					return errors.New(
+						"Field set 'Fields()' parameter refers unknown object: " +
+							strings.Join(field.Name, "."))
+				}
+
+				fqnLen := len(fullyQualifiedName)
+				s := make([]string, 0, fqnLen+1)
+				s = append(s, fullyQualifiedName...)
+				s = append(s, field.Name[len(field.Name)-1])
+				field.Name = s
+
 			case "count":
 				switch len(field.Parameters) {
 				case 0: