Add .values() method to return rows as arrays of values

porsager · porsager · commit 56873c24de63 · 2022-04-22T08:34:41.000+02:00
diff --git a/README.md b/README.md
@@ -401,13 +401,20 @@ await sql`
 Rather than executing a given query, `.describe` will return information utilized in the query process. This information can include the query identifier, column types, etc.
 
 This is useful for debugging and analyzing your Postgres queries. Furthermore, **`.describe` will give you access to the final generated query string that would be executed.**
+ 
+### Rows as Array of Values
+#### ```sql``.values()```
 
-### Raw
+Using `.values` will return rows as an array of values for each column, instead of objects.
+
+This can be useful to receive identically named columns, or for specific performance/transformation reasons. The column definitions are still included on the result array, plus access to parsers for each column.
+
+### Rows as Raw Array of Buffers
 #### ```sql``.raw()```
 
-Using `.raw()` will return rows as an array with `Buffer` values for each column, instead of objects.
+Using `.raw` will return rows as an array with `Buffer` values for each column, instead of objects.
 
-This can be useful to receive identically named columns, or for specific performance/transformation reasons. The column definitions are still included on the result array, plus access to parsers for each column.
+This can be useful for specific performance/transformation reasons. The column definitions are still included on the result array, plus access to parsers for each column.
 
 ### File
 #### `await sql.file(path, [args], [options]) -> Result[]`
diff --git a/src/connection.js b/src/connection.js
@@ -478,7 +478,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
 
       value = length === -1
         ? null
-        : query.isRaw
+        : query.isRaw === true
           ? x.slice(index, index += length)
           : column.parser === undefined
             ? x.toString('utf8', index, index += length)
@@ -487,7 +487,9 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
               : column.parser(x.toString('utf8', index, index += length))
 
       query.isRaw
-        ? (row[i] = value)
+        ? (row[i] = query.isRaw === true
+          ? value
+          : transform.value.from ? transform.value.from(value) : value)
         : (row[column.name] = transform.value.from ? transform.value.from(value) : value)
     }
 
diff --git a/src/query.js b/src/query.js
@@ -127,6 +127,11 @@ export class Query extends Promise {
     return this
   }
 
+  values() {
+    this.isRaw = 'values'
+    return this
+  }
+
   async handle() {
     !this.executed && (this.executed = true) && await 1 && this.handler(this)
   }
diff --git a/tests/index.js b/tests/index.js
@@ -1610,6 +1610,10 @@ t('Raw method returns values unparsed as Buffer', async() => {
   ]
 })
 
+t('Array returns rows as arrays of columns', async() => {
+  return [(await sql`select 1`.values())[0][0], 1]
+})
+
 t('Copy read', async() => {
   const result = []
 

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,11 @@ export class Query extends Promise {`
`127`	`127`	`return this`
`128`	`128`	`}`
`129`	`129`
	`130`	`+ values() {`
	`131`	`+ this.isRaw = 'values'`
	`132`	`+ return this`
	`133`	`+ }`
	`134`	`+`
`130`	`135`	`async handle() {`
`131`	`136`	`!this.executed && (this.executed = true) && await 1 && this.handler(this)`
`132`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1610,6 +1610,10 @@ t('Raw method returns values unparsed as Buffer', async() => {`
`1610`	`1610`	`]`
`1611`	`1611`	`})`
`1612`	`1612`
	`1613`	`+t('Array returns rows as arrays of columns', async() => {`
	`1614`	+ return [(await sql`select 1`.values())[0][0], 1]
	`1615`	`+})`
	`1616`	`+`
`1613`	`1617`	`t('Copy read', async() => {`
`1614`	`1618`	`const result = []`
`1615`	`1619`