v3: join tests

sougou · bramp · commit 51f2952dc096 · 2018-06-04T08:06:27.000-07:00
Signed-off-by: Sugu Sougoumarane &lt;ssougou@gmail.com&gt;
diff --git a/dependency/sqltypes/testing.go b/dependency/sqltypes/testing.go
@@ -53,15 +53,20 @@ func MakeTestFields(names, types string) []*querypb.Field {
 //     "10|abcd",
 //   )
 // The field type values are set as the types for the rows built.
-// Spaces are trimmed from row values.
+// Spaces are trimmed from row values. "null" is treated as NULL.
 func MakeTestResult(fields []*querypb.Field, rows ...string) *Result {
 	result := &Result{
 		Fields: fields,
-		Rows:   make([][]Value, len(rows)),
+	}
+	if len(rows) > 0 {
+		result.Rows = make([][]Value, len(rows))
 	}
 	for i, row := range rows {
 		result.Rows[i] = make([]Value, len(fields))
 		for j, col := range split(row) {
+			if col == "null" {
+				continue
+			}
 			result.Rows[i][j] = MakeTrusted(fields[j].Type, []byte(col))
 		}
 	}
