Fix Value method for NullRawMessage (#2)

kyleconroy · web-flow · commit 3544fbd435c8 · 2021-08-25T09:15:25.000-07:00
* Fix Value method for NullRawMessage

Update all tests to exercise the Value method
diff --git a/json.go b/json.go
@@ -36,5 +36,5 @@ func (n NullRawMessage) Value() (driver.Value, error) {
 	if !n.Valid {
 		return nil, nil
 	}
-	return n.RawMessage, nil
+	return []byte(n.RawMessage), nil
 }
diff --git a/tests/inet_test.go b/tests/inet_test.go
@@ -35,6 +35,9 @@ func TestInet(t *testing.T) {
 			if diff := cmp.Diff(addr, ip.IPNet.String()); diff != "" {
 				t.Errorf("IPNet mismatch (-want +got):\n%s", diff)
 			}
+			if _, err := db.Exec(`SELECT abbrev($1)`, ip); err != nil {
+				t.Fatal(err)
+			}
 		})
 	}
 	t.Run("NULL", func(t *testing.T) {
@@ -45,5 +48,8 @@ func TestInet(t *testing.T) {
 		if diff := cmp.Diff(false, ip.Valid); diff != "" {
 			t.Errorf("valid mismatch (-want +got):\n%s", diff)
 		}
+		if _, err := db.Exec(`SELECT abbrev($1)`, ip); err != nil {
+			t.Fatal(err)
+		}
 	})
 }
diff --git a/tests/json_test.go b/tests/json_test.go
@@ -32,6 +32,9 @@ func TestJSONRawMessage(t *testing.T) {
 			if diff := cmp.Diff(string(json.RawMessage(payload)), string(n.RawMessage)); diff != "" {
 				t.Errorf("json mismatch (-want +got):\n%s", diff)
 			}
+			if _, err := db.Exec(`SELECT json_typeof($1)`, n); err != nil {
+				t.Fatal(err)
+			}
 			if err := db.QueryRow(fmt.Sprintf(`SELECT '%s'::jsonb`, payload)).Scan(&n); err != nil {
 				t.Fatal(err)
 			}
@@ -41,6 +44,9 @@ func TestJSONRawMessage(t *testing.T) {
 			if diff := cmp.Diff(string(json.RawMessage(payload)), string(n.RawMessage)); diff != "" {
 				t.Errorf("jsonb mismatch (-want +got):\n%s", diff)
 			}
+			if _, err := db.Exec(`SELECT jsonb_typeof($1)`, n); err != nil {
+				t.Fatal(err)
+			}
 		})
 		t.Run("/stdlib/"+payload, func(t *testing.T) {
 			var n json.RawMessage
@@ -50,12 +56,18 @@ func TestJSONRawMessage(t *testing.T) {
 			if diff := cmp.Diff(string(json.RawMessage(payload)), string(n)); diff != "" {
 				t.Errorf("json mismatch (-want +got):\n%s", diff)
 			}
+			if _, err := db.Exec(`SELECT json_typeof($1)`, n); err != nil {
+				t.Fatal(err)
+			}
 			if err := db.QueryRow(fmt.Sprintf(`SELECT '%s'::jsonb`, payload)).Scan(&n); err != nil {
 				t.Fatal(err)
 			}
 			if diff := cmp.Diff(string(json.RawMessage(payload)), string(n)); diff != "" {
 				t.Errorf("jsonb mismatch (-want +got):\n%s", diff)
 			}
+			if _, err := db.Exec(`SELECT jsonb_typeof($1)`, n); err != nil {
+				t.Fatal(err)
+			}
 		})
 	}
 	t.Run("NULL", func(t *testing.T) {
@@ -66,11 +78,17 @@ func TestJSONRawMessage(t *testing.T) {
 		if diff := cmp.Diff(false, n.Valid); diff != "" {
 			t.Errorf("valid mismatch (-want +got):\n%s", diff)
 		}
+		if _, err := db.Exec(`SELECT json_typeof($1)`, n); err != nil {
+			t.Fatal(err)
+		}
 		if err := db.QueryRow(`SELECT NULL::jsonb`).Scan(&n); err != nil {
 			t.Fatal(err)
 		}
 		if diff := cmp.Diff(false, n.Valid); diff != "" {
 			t.Errorf("valid mismatch (-want +got):\n%s", diff)
 		}
+		if _, err := db.Exec(`SELECT jsonb_typeof($1)`, n); err != nil {
+			t.Fatal(err)
+		}
 	})
 }
diff --git a/tests/macaddr8_test.go b/tests/macaddr8_test.go
@@ -61,6 +61,9 @@ func TestMacaddr8(t *testing.T) {
 			if diff := cmp.Diff(addr.output, cidr.Addr.String()); diff != "" {
 				t.Errorf("mismatch (-want +got):\n%s", diff)
 			}
+			if _, err := db.Exec(`SELECT trunc($1::macaddr8)`, cidr); err != nil {
+				t.Fatal(err)
+			}
 		})
 	}
 	t.Run("NULL", func(t *testing.T) {
@@ -71,5 +74,8 @@ func TestMacaddr8(t *testing.T) {
 		if diff := cmp.Diff(false, cidr.Valid); diff != "" {
 			t.Errorf("valid mismatch (-want +got):\n%s", diff)
 		}
+		if _, err := db.Exec(`SELECT trunc($1::macaddr8)`, cidr); err != nil {
+			t.Fatal(err)
+		}
 	})
 }
diff --git a/tests/macaddr_test.go b/tests/macaddr_test.go
@@ -55,6 +55,9 @@ func TestMacaddr(t *testing.T) {
 			if diff := cmp.Diff(addr.output, cidr.Addr.String()); diff != "" {
 				t.Errorf("mismatch (-want +got):\n%s", diff)
 			}
+			if _, err := db.Exec(`SELECT trunc($1::macaddr)`, cidr); err != nil {
+				t.Fatal(err)
+			}
 		})
 	}
 	t.Run("NULL", func(t *testing.T) {
@@ -65,5 +68,8 @@ func TestMacaddr(t *testing.T) {
 		if diff := cmp.Diff(false, cidr.Valid); diff != "" {
 			t.Errorf("valid mismatch (-want +got):\n%s", diff)
 		}
+		if _, err := db.Exec(`SELECT trunc($1::macaddr)`, cidr); err != nil {
+			t.Fatal(err)
+		}
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,5 @@ func (n NullRawMessage) Value() (driver.Value, error) {`
`36`	`36`	`if !n.Valid {`
`37`	`37`	`return nil, nil`
`38`	`38`	`}`
`39`		`- return n.RawMessage, nil`
	`39`	`+ return []byte(n.RawMessage), nil`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,9 @@ func TestInet(t *testing.T) {`
`35`	`35`	`if diff := cmp.Diff(addr, ip.IPNet.String()); diff != "" {`
`36`	`36`	`t.Errorf("IPNet mismatch (-want +got):\n%s", diff)`
`37`	`37`	`}`
	`38`	+ if _, err := db.Exec(`SELECT abbrev($1)`, ip); err != nil {
	`39`	`+ t.Fatal(err)`
	`40`	`+ }`
`38`	`41`	`})`
`39`	`42`	`}`
`40`	`43`	`t.Run("NULL", func(t *testing.T) {`
`@@ -45,5 +48,8 @@ func TestInet(t *testing.T) {`
`45`	`48`	`if diff := cmp.Diff(false, ip.Valid); diff != "" {`
`46`	`49`	`t.Errorf("valid mismatch (-want +got):\n%s", diff)`
`47`	`50`	`}`
	`51`	+ if _, err := db.Exec(`SELECT abbrev($1)`, ip); err != nil {
	`52`	`+ t.Fatal(err)`
	`53`	`+ }`
`48`	`54`	`})`
`49`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ func TestJSONRawMessage(t *testing.T) {`
`32`	`32`	`if diff := cmp.Diff(string(json.RawMessage(payload)), string(n.RawMessage)); diff != "" {`
`33`	`33`	`t.Errorf("json mismatch (-want +got):\n%s", diff)`
`34`	`34`	`}`
	`35`	+ if _, err := db.Exec(`SELECT json_typeof($1)`, n); err != nil {
	`36`	`+ t.Fatal(err)`
	`37`	`+ }`
`35`	`38`	if err := db.QueryRow(fmt.Sprintf(`SELECT '%s'::jsonb`, payload)).Scan(&n); err != nil {
`36`	`39`	`t.Fatal(err)`
`37`	`40`	`}`
`@@ -41,6 +44,9 @@ func TestJSONRawMessage(t *testing.T) {`
`41`	`44`	`if diff := cmp.Diff(string(json.RawMessage(payload)), string(n.RawMessage)); diff != "" {`
`42`	`45`	`t.Errorf("jsonb mismatch (-want +got):\n%s", diff)`
`43`	`46`	`}`
	`47`	+ if _, err := db.Exec(`SELECT jsonb_typeof($1)`, n); err != nil {
	`48`	`+ t.Fatal(err)`
	`49`	`+ }`
`44`	`50`	`})`
`45`	`51`	`t.Run("/stdlib/"+payload, func(t *testing.T) {`
`46`	`52`	`var n json.RawMessage`
`@@ -50,12 +56,18 @@ func TestJSONRawMessage(t *testing.T) {`
`50`	`56`	`if diff := cmp.Diff(string(json.RawMessage(payload)), string(n)); diff != "" {`
`51`	`57`	`t.Errorf("json mismatch (-want +got):\n%s", diff)`
`52`	`58`	`}`
	`59`	+ if _, err := db.Exec(`SELECT json_typeof($1)`, n); err != nil {
	`60`	`+ t.Fatal(err)`
	`61`	`+ }`
`53`	`62`	if err := db.QueryRow(fmt.Sprintf(`SELECT '%s'::jsonb`, payload)).Scan(&n); err != nil {
`54`	`63`	`t.Fatal(err)`
`55`	`64`	`}`
`56`	`65`	`if diff := cmp.Diff(string(json.RawMessage(payload)), string(n)); diff != "" {`
`57`	`66`	`t.Errorf("jsonb mismatch (-want +got):\n%s", diff)`
`58`	`67`	`}`
	`68`	+ if _, err := db.Exec(`SELECT jsonb_typeof($1)`, n); err != nil {
	`69`	`+ t.Fatal(err)`
	`70`	`+ }`
`59`	`71`	`})`
`60`	`72`	`}`
`61`	`73`	`t.Run("NULL", func(t *testing.T) {`
`@@ -66,11 +78,17 @@ func TestJSONRawMessage(t *testing.T) {`
`66`	`78`	`if diff := cmp.Diff(false, n.Valid); diff != "" {`
`67`	`79`	`t.Errorf("valid mismatch (-want +got):\n%s", diff)`
`68`	`80`	`}`
	`81`	+ if _, err := db.Exec(`SELECT json_typeof($1)`, n); err != nil {
	`82`	`+ t.Fatal(err)`
	`83`	`+ }`
`69`	`84`	if err := db.QueryRow(`SELECT NULL::jsonb`).Scan(&n); err != nil {
`70`	`85`	`t.Fatal(err)`
`71`	`86`	`}`
`72`	`87`	`if diff := cmp.Diff(false, n.Valid); diff != "" {`
`73`	`88`	`t.Errorf("valid mismatch (-want +got):\n%s", diff)`
`74`	`89`	`}`
	`90`	+ if _, err := db.Exec(`SELECT jsonb_typeof($1)`, n); err != nil {
	`91`	`+ t.Fatal(err)`
	`92`	`+ }`
`75`	`93`	`})`
`76`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,9 @@ func TestMacaddr8(t *testing.T) {`
`61`	`61`	`if diff := cmp.Diff(addr.output, cidr.Addr.String()); diff != "" {`
`62`	`62`	`t.Errorf("mismatch (-want +got):\n%s", diff)`
`63`	`63`	`}`
	`64`	+ if _, err := db.Exec(`SELECT trunc($1::macaddr8)`, cidr); err != nil {
	`65`	`+ t.Fatal(err)`
	`66`	`+ }`
`64`	`67`	`})`
`65`	`68`	`}`
`66`	`69`	`t.Run("NULL", func(t *testing.T) {`
`@@ -71,5 +74,8 @@ func TestMacaddr8(t *testing.T) {`
`71`	`74`	`if diff := cmp.Diff(false, cidr.Valid); diff != "" {`
`72`	`75`	`t.Errorf("valid mismatch (-want +got):\n%s", diff)`
`73`	`76`	`}`
	`77`	+ if _, err := db.Exec(`SELECT trunc($1::macaddr8)`, cidr); err != nil {
	`78`	`+ t.Fatal(err)`
	`79`	`+ }`
`74`	`80`	`})`
`75`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@ func TestMacaddr(t *testing.T) {`
`55`	`55`	`if diff := cmp.Diff(addr.output, cidr.Addr.String()); diff != "" {`
`56`	`56`	`t.Errorf("mismatch (-want +got):\n%s", diff)`
`57`	`57`	`}`
	`58`	+ if _, err := db.Exec(`SELECT trunc($1::macaddr)`, cidr); err != nil {
	`59`	`+ t.Fatal(err)`
	`60`	`+ }`
`58`	`61`	`})`
`59`	`62`	`}`
`60`	`63`	`t.Run("NULL", func(t *testing.T) {`
`@@ -65,5 +68,8 @@ func TestMacaddr(t *testing.T) {`
`65`	`68`	`if diff := cmp.Diff(false, cidr.Valid); diff != "" {`
`66`	`69`	`t.Errorf("valid mismatch (-want +got):\n%s", diff)`
`67`	`70`	`}`
	`71`	+ if _, err := db.Exec(`SELECT trunc($1::macaddr)`, cidr); err != nil {
	`72`	`+ t.Fatal(err)`
	`73`	`+ }`
`68`	`74`	`})`
`69`	`75`	`}`