kopia lustrzana https://github.com/cloudflare/wildebeest
Merge pull request #399 from cloudflare/sven/fix-properties-parsing-neon2
more fix properties parsing with Neonpull/400/head
commit
cd423b8bfd
|
@ -128,7 +128,15 @@ export async function cacheObject(
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
const properties = JSON.parse(row.properties)
|
let properties
|
||||||
|
if (typeof row.properties === 'object') {
|
||||||
|
// neon uses JSONB for properties which is returned as a deserialized
|
||||||
|
// object.
|
||||||
|
properties = row.properties
|
||||||
|
} else {
|
||||||
|
// D1 uses a string for JSON properties
|
||||||
|
properties = JSON.parse(row.properties)
|
||||||
|
}
|
||||||
const object = {
|
const object = {
|
||||||
published: new Date(row.cdate).toISOString(),
|
published: new Date(row.cdate).toISOString(),
|
||||||
...properties,
|
...properties,
|
||||||
|
@ -206,7 +214,15 @@ export async function getObjectBy(db: Database, key: ObjectByKey, value: string)
|
||||||
}
|
}
|
||||||
|
|
||||||
const result: any = results[0]
|
const result: any = results[0]
|
||||||
const properties = JSON.parse(result.properties)
|
let properties
|
||||||
|
if (typeof result.properties === 'object') {
|
||||||
|
// neon uses JSONB for properties which is returned as a deserialized
|
||||||
|
// object.
|
||||||
|
properties = result.properties
|
||||||
|
} else {
|
||||||
|
// D1 uses a string for JSON properties
|
||||||
|
properties = JSON.parse(result.properties)
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
published: new Date(result.cdate).toISOString(),
|
published: new Date(result.cdate).toISOString(),
|
||||||
|
|
|
@ -36,7 +36,15 @@ export async function hasKey(db: Database, key: string): Promise<APObject | null
|
||||||
}
|
}
|
||||||
|
|
||||||
const result = results[0]
|
const result = results[0]
|
||||||
const properties = JSON.parse(result.properties)
|
let properties
|
||||||
|
if (typeof result.properties === 'object') {
|
||||||
|
// neon uses JSONB for properties which is returned as a deserialized
|
||||||
|
// object.
|
||||||
|
properties = result.properties
|
||||||
|
} else {
|
||||||
|
// D1 uses a string for JSON properties
|
||||||
|
properties = JSON.parse(result.properties)
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
published: new Date(result.cdate).toISOString(),
|
published: new Date(result.cdate).toISOString(),
|
||||||
|
|
Ładowanie…
Reference in New Issue