expose table oid and column number (porsager#409)

Newbie012 · web-flow · commit 599d0e782ae0 · 2022-07-06T14:32:18.000+02:00
* expose table oid and att num from description

* add types

* rename properties

* add tests
diff --git a/cjs/src/connection.js b/cjs/src/connection.js
@@ -615,12 +615,16 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     for (let i = 0; i < length; ++i) {
       start = index
       while (x[index++] !== 0);
+      const table = x.readUInt32BE(index)
+      const number = x.readUInt16BE(index + 4)
       const type = x.readUInt32BE(index + 6)
       query.statement.columns[i] = {
         name: transform.column.from
           ? transform.column.from(x.toString('utf8', start, index - 1))
           : x.toString('utf8', start, index - 1),
         parser: parsers[type],
+        table,
+        number,
         type
       }
       index += 18
diff --git a/cjs/tests/index.js b/cjs/tests/index.js
@@ -1891,6 +1891,18 @@ t('Describe a statement', async() => {
   ]
 })
 
+t('Include table oid and column number in column details', async() => {
+    await sql`create table tester (name text, age int)`
+    const r = await sql`select name, age from tester where name like $1 and age > $2`.describe();
+    const [{ oid }] = await sql`select oid from pg_class where relname = 'tester'`;
+
+    return [
+        `table:${oid},number:1|table:${oid},number:2`,
+        `${ r.columns.map(c => `table:${c.table},number:${c.number}`).join('|') }`,
+        await sql`drop table tester`
+    ]
+})
+
 t('Describe a statement without parameters', async() => {
   await sql`create table tester (name text, age int)`
   const r = await sql`select name, age from tester`.describe()
@@ -2182,4 +2194,4 @@ t('Insert array with undefined transform', async() => {
     (await sql`select x from test`)[0].x[0],
     await sql`drop table test`
   ]
-})
+})
diff --git a/deno/src/connection.js b/deno/src/connection.js
@@ -619,12 +619,16 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     for (let i = 0; i < length; ++i) {
       start = index
       while (x[index++] !== 0);
+      const table = x.readUInt32BE(index)
+      const number = x.readUInt16BE(index + 4)
       const type = x.readUInt32BE(index + 6)
       query.statement.columns[i] = {
         name: transform.column.from
           ? transform.column.from(x.toString('utf8', start, index - 1))
           : x.toString('utf8', start, index - 1),
         parser: parsers[type],
+        table,
+        number,
         type
       }
       index += 18
diff --git a/deno/tests/index.js b/deno/tests/index.js
@@ -1893,6 +1893,18 @@ t('Describe a statement', async() => {
   ]
 })
 
+t('Include table oid and column number in column details', async() => {
+    await sql`create table tester (name text, age int)`
+    const r = await sql`select name, age from tester where name like $1 and age > $2`.describe();
+    const [{ oid }] = await sql`select oid from pg_class where relname = 'tester'`;
+
+    return [
+        `table:${oid},number:1|table:${oid},number:2`,
+        `${ r.columns.map(c => `table:${c.table},number:${c.number}`).join('|') }`,
+        await sql`drop table tester`
+    ]
+})
+
 t('Describe a statement without parameters', async() => {
   await sql`create table tester (name text, age int)`
   const r = await sql`select name, age from tester`.describe()
@@ -2185,5 +2197,4 @@ t('Insert array with undefined transform', async() => {
     await sql`drop table test`
   ]
 })
-
 ;window.addEventListener("unload", () => Deno.exit(process.exitCode))
diff --git a/deno/types/index.d.ts b/deno/types/index.d.ts
@@ -505,6 +505,8 @@ declare namespace postgres {
   interface Column<T extends string> {
     name: T;
     type: number;
+    table: number;
+    number: number;
     parser?(raw: string): unknown;
   }
 
diff --git a/src/connection.js b/src/connection.js
@@ -615,12 +615,16 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     for (let i = 0; i < length; ++i) {
       start = index
       while (x[index++] !== 0);
+      const table = x.readUInt32BE(index)
+      const number = x.readUInt16BE(index + 4)
       const type = x.readUInt32BE(index + 6)
       query.statement.columns[i] = {
         name: transform.column.from
           ? transform.column.from(x.toString('utf8', start, index - 1))
           : x.toString('utf8', start, index - 1),
         parser: parsers[type],
+        table,
+        number,
         type
       }
       index += 18
diff --git a/tests/index.js b/tests/index.js
@@ -1891,6 +1891,18 @@ t('Describe a statement', async() => {
   ]
 })
 
+t('Include table oid and column number in column details', async() => {
+    await sql`create table tester (name text, age int)`
+    const r = await sql`select name, age from tester where name like $1 and age > $2`.describe();
+    const [{ oid }] = await sql`select oid from pg_class where relname = 'tester'`;
+
+    return [
+        `table:${oid},number:1|table:${oid},number:2`,
+        `${ r.columns.map(c => `table:${c.table},number:${c.number}`).join('|') }`,
+        await sql`drop table tester`
+    ]
+})
+
 t('Describe a statement without parameters', async() => {
   await sql`create table tester (name text, age int)`
   const r = await sql`select name, age from tester`.describe()
@@ -2182,4 +2194,4 @@ t('Insert array with undefined transform', async() => {
     (await sql`select x from test`)[0].x[0],
     await sql`drop table test`
   ]
-})
+})
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -497,6 +497,8 @@ declare namespace postgres {
   interface Column<T extends string> {
     name: T;
     type: number;
+    table: number;
+    number: number;
     parser?(raw: string): unknown;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -505,6 +505,8 @@ declare namespace postgres {`
`505`	`505`	`interface Column<T extends string> {`
`506`	`506`	`name: T;`
`507`	`507`	`type: number;`
	`508`	`+ table: number;`
	`509`	`+ number: number;`
`508`	`510`	`parser?(raw: string): unknown;`
`509`	`511`	`}`
`510`	`512`
Original file line number	Diff line number	Diff line change
`@@ -497,6 +497,8 @@ declare namespace postgres {`
`497`	`497`	`interface Column<T extends string> {`
`498`	`498`	`name: T;`
`499`	`499`	`type: number;`
	`500`	`+ table: number;`
	`501`	`+ number: number;`
`500`	`502`	`parser?(raw: string): unknown;`
`501`	`503`	`}`
`502`	`504`