Use tenntenn/jsonschema

go.mod

@@ -3,7 +3,7 @@ module github.com/gcpug/hake
 require (
 	cloud.google.com/go v0.35.1
 	github.com/golang/protobuf v1.2.0
-	github.com/tenntenn/jsonschema v0.0.1
+	github.com/tenntenn/jsonschema v0.0.2
 	github.com/xeipuuv/gojsonschema v1.1.0
 	google.golang.org/genproto v0.0.0-20190201180003-4b09977fb922
 )

json_row.go

@@ -131,6 +131,7 @@ func (rs JSONRows) toJSONRowSlice() []*JSONRow {
 	for i := range rs {
 		rows[i] = rs.At(i)
 	}
+
 	return rows
 }
 
@@ -141,5 +142,5 @@ func (rs JSONRows) MarshalJSON() ([]byte, error) {
 
 // Schema writes JSON Schema of the rows to writer w.
 func (rs JSONRows) JSONSchema(w io.Writer, options ...jsonschema.Option) error {
-	return jsonschema.Generate(w, rs, options...)
+	return jsonschema.Generate(w, rs.toJSONRowSlice(), options...)
 }

json_row_test.go

@@ -120,3 +120,58 @@ func TestJSONRow_JSONSchema(t *testing.T) {
 		})
 	}
 }
+
+func TestJSONRows_JSONSchema(t *testing.T) {
+
+	type T struct {
+		N int
+		S string
+	}
+
+	type NT struct {
+		T T
+	}
+
+	cases := []struct {
+		name  string
+		rows  []*spanner.Row
+		isErr bool
+	}{
+		{"int", rows(t, []R{{"col1", 100}}), false},
+		{"int int", rows(t, []R{{"col1", 100}, {"col1", 200}}), false},
+		{"int string", rows(t, []R{{"col1", 100, "col2", "string"}}), false},
+		{"nested struct", rows(t, []R{{"col1", 100, "col2", T{N: 100, S: ""}}}), false},
+		{"timestamp", rows(t, []R{{"col1", 100, "col2", timestamp(t, "2002-10-02T10:00:00Z")}}), false},
+		{"bytes", rows(t, []R{{"col1", []byte("test")}}), false},
+	}
+
+	for _, tt := range cases {
+		tt := tt
+		t.Run(tt.name, func(t *testing.T) {
+			var got bytes.Buffer
+			err := JSONRows(tt.rows).JSONSchema(&got)
+			switch {
+			case tt.isErr && err == nil:
+				t.Errorf("expected error does not occur")
+			case !tt.isErr && err != nil:
+				t.Errorf("unexpected error %v", err)
+			}
+
+			l := gojsonschema.NewStringLoader(got.String())
+			s, err := gojsonschema.NewSchema(l)
+			if err != nil {
+				t.Fatalf("unexpected error %v", err)
+			}
+
+			rowJSON := toJSON(t, JSONRows(tt.rows))
+			r, err := s.Validate(gojsonschema.NewStringLoader(rowJSON))
+			if err != nil {
+				t.Fatalf("unexpected error %v", err)
+			}
+
+			if !r.Valid() {
+				t.Errorf("invalid JSON Schema: %s", got.String())
+			}
+		})
+	}
+}