Fix BigInt handling

porsager · porsager · commit 36a70df3b872 · 2022-03-31T13:56:11.000+02:00
diff --git a/cjs/src/index.js b/cjs/src/index.js
@@ -30,7 +30,12 @@ Object.assign(Postgres, {
   fromPascal,
   fromCamel,
   fromKebab,
-  BigInt
+  BigInt: {
+    to: 20,
+    from: [20],
+    parse: x => BigInt(x), // eslint-disable-line
+    serialize: x => x.toString()
+  }
 })
 
 module.exports = Postgres
diff --git a/cjs/src/subscribe.js b/cjs/src/subscribe.js
@@ -31,7 +31,7 @@ module.exports = Subscribe;function Subscribe(postgres, options) {
 
     const fns = listeners.has(event)
       ? listeners.get(event).add(fn)
-      : listeners.set(event, new Set([fn]))
+      : listeners.set(event, new Set([fn])).get(event)
 
     const unsubscribe = () => {
       fns.delete(fn)
@@ -180,7 +180,7 @@ function parse(x, state, parsers, handle) {
         ? {}
         : null
 
-      old && (i = tuples(x, old, key ? relation.keys : relation.columns, ++i))
+      old && (i = tuples(x, old, key ? relation.keys : relation.columns, i += 3))
 
       const row = {}
       i = tuples(x, row, relation.columns, i += 3)
diff --git a/cjs/src/types.js b/cjs/src/types.js
@@ -39,13 +39,6 @@ const types = module.exports.types = {
   }
 }
 
-const BigInt = module.exports.BigInt = {
-  to: 1700,
-  from: [20, 701, 1700],
-  parse: x => BigInt(x), // eslint-disable-line
-  serialize: x => x.toString()
-}
-
 class NotTagged { then() { notTagged() } catch() { notTagged() } finally() { notTagged() }}
 
 const Identifier = module.exports.Identifier = class Identifier extends NotTagged {
@@ -196,7 +189,7 @@ const inferType = module.exports.inferType = function inferType(x) {
     x instanceof Date ? 1184 :
     x instanceof Uint8Array ? 17 :
     (x === true || x === false) ? 16 :
-    typeof x === 'bigint' ? 1700 :
+    typeof x === 'bigint' ? 20 :
     Array.isArray(x) ? inferType(x[0]) :
     0
   )
diff --git a/cjs/tests/index.js b/cjs/tests/index.js
@@ -1712,8 +1712,8 @@ t('subscribe', { timeout: 2 }, async() => {
 
   const result = []
 
-  await sql.subscribe('*', (row, info) =>
-    result.push(info.command, row.name || row.id)
+  const { unsubscribe } = await sql.subscribe('*', (row, { command, old }) =>
+    result.push(command, row.name || row.id, old && old.name)
   )
 
   await sql`
@@ -1722,12 +1722,21 @@ t('subscribe', { timeout: 2 }, async() => {
       name text
     )
   `
+
+  await sql`alter table test replica identity default`
   await sql`insert into test (name) values ('Murray')`
   await sql`update test set name = 'Rothbard'`
   await sql`delete from test`
+  await sql`alter table test replica identity full`
+  await sql`insert into test (name) values ('Murray')`
+  await sql`update test set name = 'Rothbard'`
+  await sql`delete from test`
+  await delay(100)
+  await unsubscribe()
+  await sql`insert into test (name) values ('Oh noes')`
   await delay(100)
   return [
-    'insert,Murray,update,Rothbard,delete,1',
+    'insert,Murray,,update,Rothbard,,delete,1,,insert,Murray,,update,Rothbard,Murray,delete,Rothbard,',
     result.join(','),
     await sql`drop table test`,
     await sql`drop publication alltables`,
diff --git a/deno/src/index.js b/deno/src/index.js
@@ -31,7 +31,12 @@ Object.assign(Postgres, {
   fromPascal,
   fromCamel,
   fromKebab,
-  BigInt
+  BigInt: {
+    to: 20,
+    from: [20],
+    parse: x => BigInt(x), // eslint-disable-line
+    serialize: x => x.toString()
+  }
 })
 
 export default Postgres
diff --git a/deno/src/subscribe.js b/deno/src/subscribe.js
@@ -32,7 +32,7 @@ export default function Subscribe(postgres, options) {
 
     const fns = listeners.has(event)
       ? listeners.get(event).add(fn)
-      : listeners.set(event, new Set([fn]))
+      : listeners.set(event, new Set([fn])).get(event)
 
     const unsubscribe = () => {
       fns.delete(fn)
@@ -181,7 +181,7 @@ function parse(x, state, parsers, handle) {
         ? {}
         : null
 
-      old && (i = tuples(x, old, key ? relation.keys : relation.columns, ++i))
+      old && (i = tuples(x, old, key ? relation.keys : relation.columns, i += 3))
 
       const row = {}
       i = tuples(x, row, relation.columns, i += 3)
diff --git a/deno/src/types.js b/deno/src/types.js
@@ -40,13 +40,6 @@ export const types = {
   }
 }
 
-export const BigInt = {
-  to: 1700,
-  from: [20, 701, 1700],
-  parse: x => BigInt(x), // eslint-disable-line
-  serialize: x => x.toString()
-}
-
 class NotTagged { then() { notTagged() } catch() { notTagged() } finally() { notTagged() }}
 
 export class Identifier extends NotTagged {
@@ -197,7 +190,7 @@ export const inferType = function inferType(x) {
     x instanceof Date ? 1184 :
     x instanceof Uint8Array ? 17 :
     (x === true || x === false) ? 16 :
-    typeof x === 'bigint' ? 1700 :
+    typeof x === 'bigint' ? 20 :
     Array.isArray(x) ? inferType(x[0]) :
     0
   )
diff --git a/deno/tests/index.js b/deno/tests/index.js
@@ -1713,8 +1713,8 @@ t('subscribe', { timeout: 2 }, async() => {
 
   const result = []
 
-  await sql.subscribe('*', (row, info) =>
-    result.push(info.command, row.name || row.id)
+  const { unsubscribe } = await sql.subscribe('*', (row, { command, old }) =>
+    result.push(command, row.name || row.id, old && old.name)
   )
 
   await sql`
@@ -1723,12 +1723,21 @@ t('subscribe', { timeout: 2 }, async() => {
       name text
     )
   `
+
+  await sql`alter table test replica identity default`
   await sql`insert into test (name) values ('Murray')`
   await sql`update test set name = 'Rothbard'`
   await sql`delete from test`
+  await sql`alter table test replica identity full`
+  await sql`insert into test (name) values ('Murray')`
+  await sql`update test set name = 'Rothbard'`
+  await sql`delete from test`
+  await delay(100)
+  await unsubscribe()
+  await sql`insert into test (name) values ('Oh noes')`
   await delay(100)
   return [
-    'insert,Murray,update,Rothbard,delete,1',
+    'insert,Murray,,update,Rothbard,,delete,1,,insert,Murray,,update,Rothbard,Murray,delete,Rothbard,',
     result.join(','),
     await sql`drop table test`,
     await sql`drop publication alltables`,
diff --git a/src/index.js b/src/index.js
@@ -30,7 +30,12 @@ Object.assign(Postgres, {
   fromPascal,
   fromCamel,
   fromKebab,
-  BigInt
+  BigInt: {
+    to: 20,
+    from: [20],
+    parse: x => BigInt(x), // eslint-disable-line
+    serialize: x => x.toString()
+  }
 })
 
 export default Postgres
diff --git a/src/types.js b/src/types.js
@@ -39,13 +39,6 @@ export const types = {
   }
 }
 
-export const BigInt = {
-  to: 1700,
-  from: [20, 701, 1700],
-  parse: x => BigInt(x), // eslint-disable-line
-  serialize: x => x.toString()
-}
-
 class NotTagged { then() { notTagged() } catch() { notTagged() } finally() { notTagged() }}
 
 export class Identifier extends NotTagged {
@@ -196,7 +189,7 @@ export const inferType = function inferType(x) {
     x instanceof Date ? 1184 :
     x instanceof Uint8Array ? 17 :
     (x === true || x === false) ? 16 :
-    typeof x === 'bigint' ? 1700 :
+    typeof x === 'bigint' ? 20 :
     Array.isArray(x) ? inferType(x[0]) :
     0
   )

Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,6 @@ const types = module.exports.types = {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`-const BigInt = module.exports.BigInt = {`
`43`		`- to: 1700,`
`44`		`- from: [20, 701, 1700],`
`45`		`- parse: x => BigInt(x), // eslint-disable-line`
`46`		`- serialize: x => x.toString()`
`47`		`-}`
`48`		`-`
`49`	`42`	`class NotTagged { then() { notTagged() } catch() { notTagged() } finally() { notTagged() }}`
`50`	`43`
`51`	`44`	`const Identifier = module.exports.Identifier = class Identifier extends NotTagged {`
`@@ -196,7 +189,7 @@ const inferType = module.exports.inferType = function inferType(x) {`
`196`	`189`	`x instanceof Date ? 1184 :`
`197`	`190`	`x instanceof Uint8Array ? 17 :`
`198`	`191`	`(x === true \|\| x === false) ? 16 :`
`199`		`- typeof x === 'bigint' ? 1700 :`
	`192`	`+ typeof x === 'bigint' ? 20 :`
`200`	`193`	`Array.isArray(x) ? inferType(x[0]) :`
`201`	`194`	`0`
`202`	`195`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,6 @@ export const types = {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`-export const BigInt = {`
`44`		`- to: 1700,`
`45`		`- from: [20, 701, 1700],`
`46`		`- parse: x => BigInt(x), // eslint-disable-line`
`47`		`- serialize: x => x.toString()`
`48`		`-}`
`49`		`-`
`50`	`43`	`class NotTagged { then() { notTagged() } catch() { notTagged() } finally() { notTagged() }}`
`51`	`44`
`52`	`45`	`export class Identifier extends NotTagged {`
`@@ -197,7 +190,7 @@ export const inferType = function inferType(x) {`
`197`	`190`	`x instanceof Date ? 1184 :`
`198`	`191`	`x instanceof Uint8Array ? 17 :`
`199`	`192`	`(x === true \|\| x === false) ? 16 :`
`200`		`- typeof x === 'bigint' ? 1700 :`
	`193`	`+ typeof x === 'bigint' ? 20 :`
`201`	`194`	`Array.isArray(x) ? inferType(x[0]) :`
`202`	`195`	`0`
`203`	`196`	`)`
Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,6 @@ export const types = {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`-export const BigInt = {`
`43`		`- to: 1700,`
`44`		`- from: [20, 701, 1700],`
`45`		`- parse: x => BigInt(x), // eslint-disable-line`
`46`		`- serialize: x => x.toString()`
`47`		`-}`
`48`		`-`
`49`	`42`	`class NotTagged { then() { notTagged() } catch() { notTagged() } finally() { notTagged() }}`
`50`	`43`
`51`	`44`	`export class Identifier extends NotTagged {`
`@@ -196,7 +189,7 @@ export const inferType = function inferType(x) {`
`196`	`189`	`x instanceof Date ? 1184 :`
`197`	`190`	`x instanceof Uint8Array ? 17 :`
`198`	`191`	`(x === true \|\| x === false) ? 16 :`
`199`		`- typeof x === 'bigint' ? 1700 :`
	`192`	`+ typeof x === 'bigint' ? 20 :`
`200`	`193`	`Array.isArray(x) ? inferType(x[0]) :`
`201`	`194`	`0`
`202`	`195`	`)`