cast: JSON is always UTF8

mattrobenolt · mattrobenolt · commit 0bba9076bb08 · 2024-04-29T09:06:50.000-07:00
diff --git a/__tests__/golden.test.ts b/__tests__/golden.test.ts
@@ -62,7 +62,7 @@ describe('golden', () => {
       aa: 'aa',
       ab: 'foo',
       ac: 'foo,bar',
-      ad: { ad: null },
+      ad: { ad: null, foo: 'ü' },
       ae: uint8ArrayFromHex(
         '0x0000000001020000000300000000000000000000000000000000000000000000000000F03F000000000000F03F00000000000000400000000000000000'
       ),
diff --git a/golden/database.json b/golden/database.json
@@ -514,7 +514,7 @@
         "2",
         "3",
         "7",
-        "12",
+        "25",
         "61",
         "25",
         "61",
@@ -529,7 +529,7 @@
         "2",
         "-1"
       ],
-      "values": "MTExMTExMS4xMS4xMS4xMS4xBzEwMDAtMDEtMDExMDAwLTAxLTAxIDAxOjAxOjAxMTk3MC0wMS0wMSAwMDowMTowMTAxOjAxOjAxMjAwNnBxcgAAAHN0dXZ3eHl6YWFmb29mb28sYmFyeyJhZCI6IG51bGx9AAAAAAECAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwPwAAAAAAAPA/AAAAAAAAAEAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAPA/AAAAAAAA8D8AAAAAAQIAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA/AAAAAAAA8D8AAAAAAAAAQAAAAAAAAAAAAAAAAAEDAAAAAgAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAPA/AAAAAAAA8D8AAAAAAADwPwAAAAAAAABAAAAAAAAAAEAAAAAAAADwPwAAAAAAAPA/AAAAAAAA8D8xMTExeGF4YnhjAAB4ZA=="
+      "values": "MTExMTExMS4xMS4xMS4xMS4xBzEwMDAtMDEtMDExMDAwLTAxLTAxIDAxOjAxOjAxMTk3MC0wMS0wMSAwMDowMTowMTAxOjAxOjAxMjAwNnBxcgAAAHN0dXZ3eHl6YWFmb29mb28sYmFyeyJhZCI6IG51bGwsICJmb28iOiAiw7wifQAAAAABAgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8D8AAAAAAADwPwAAAAAAAABAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAADwPwAAAAAAAPA/AAAAAAECAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwPwAAAAAAAPA/AAAAAAAAAEAAAAAAAAAAAAAAAAABAwAAAAIAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAADwPwAAAAAAAPA/AAAAAAAA8D8AAAAAAAAAQAAAAAAAAABAAAAAAAAA8D8AAAAAAADwPwAAAAAAAPA/MTExMXhheGJ4YwAAeGQ="
     }
   ]
 }
diff --git a/golden/test.sql b/golden/test.sql
@@ -79,7 +79,7 @@ INSERT INTO `test` VALUES (
     'aa',
     'foo',
     'foo,bar',
-    '{"ad":null}',
+    '{"ad":null,"foo":"ü"}',
     ST_GeomFromText('LINESTRING(0 0, 1 1, 2 0)'),
     POINT(1, 1),
     ST_GeomFromText('LINESTRING(0 0, 1 1, 2 0)'),
diff --git a/src/cast.ts b/src/cast.ts
@@ -23,7 +23,7 @@ export function cast(field: Field, value: any): any {
   }
 
   if (isJson(field)) {
-    return JSON.parse(value)
+    return JSON.parse(decodeUtf8(value))
   }
 
   if (isIntegral(field)) {

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,7 @@`
`514`	`514`	`"2",`
`515`	`515`	`"3",`
`516`	`516`	`"7",`
`517`		`- "12",`
	`517`	`+ "25",`
`518`	`518`	`"61",`
`519`	`519`	`"25",`
`520`	`520`	`"61",`
`@@ -529,7 +529,7 @@`
`529`	`529`	`"2",`
`530`	`530`	`"-1"`
`531`	`531`	`],`
`532`		- "values": "MTExMTExMS4xMS4xMS4xMS4xBzEwMDAtMDEtMDExMDAwLTAxLTAxIDAxOjAxOjAxMTk3MC0wMS0wMSAwMDowMTowMTAxOjAxOjAxMjAwNnBxcgAAAHN0dXZ3eHl6YWFmb29mb28sYmFyeyJhZCI6IG51bGx9AAAAAAECAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwPwAAAAAAAPA/AAAAAAAAAEAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAPA/AAAAAAAA8D8AAAAAAQIAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA/AAAAAAAA8D8AAAAAAAAAQAAAAAAAAAAAAAAAAAEDAAAAAgAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAPA/AAAAAAAA8D8AAAAAAADwPwAAAAAAAABAAAAAAAAAAEAAAAAAAADwPwAAAAAAAPA/AAAAAAAA8D8xMTExeGF4YnhjAAB4ZA=="
	`532`	+ "values": "MTExMTExMS4xMS4xMS4xMS4xBzEwMDAtMDEtMDExMDAwLTAxLTAxIDAxOjAxOjAxMTk3MC0wMS0wMSAwMDowMTowMTAxOjAxOjAxMjAwNnBxcgAAAHN0dXZ3eHl6YWFmb29mb28sYmFyeyJhZCI6IG51bGwsICJmb28iOiAiw7wifQAAAAABAgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8D8AAAAAAADwPwAAAAAAAABAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAADwPwAAAAAAAPA/AAAAAAECAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwPwAAAAAAAPA/AAAAAAAAAEAAAAAAAAAAAAAAAAABAwAAAAIAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAADwPwAAAAAAAPA/AAAAAAAA8D8AAAAAAAAAQAAAAAAAAABAAAAAAAAA8D8AAAAAAADwPwAAAAAAAPA/MTExMXhheGJ4YwAAeGQ="
`533`	`533`	`}`
`534`	`534`	`]`
`535`	`535`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export function cast(field: Field, value: any): any {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`if (isJson(field)) {`
`26`		`- return JSON.parse(value)`
	`26`	`+ return JSON.parse(decodeUtf8(value))`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`if (isIntegral(field)) {`