Improve transform handling

porsager · porsager · commit c44d0ae781f2 · 2019-11-29T13:43:28.000+01:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,6 +4,7 @@
     "node": true,
     "es6": true
   },
+  "parser": "babel-eslint",
   "parserOptions": {
     "ecmaVersion": 9,
     "sourceType": "module"
diff --git a/lib/backend.js b/lib/backend.js
@@ -192,7 +192,9 @@ function Backend({
       start = index
       while (x[index++] !== 0);
       backend.query.statement.columns[i] = {
-        n: transform(x.utf8Slice(start, index - 1)),
+        n: transform === null
+          ? x.utf8Slice(start, index - 1)
+          : transform(x.utf8Slice(start, index - 1)),
         p: parsers[x.readInt32BE(index + 6)]
       }
       index += 18
diff --git a/lib/index.js b/lib/index.js
@@ -43,6 +43,7 @@ export default function Postgres(url, options) {
   }
 
   Object.assign(postgres, {
+    options,
     parameters: {},
     listen,
     begin,
@@ -442,7 +443,7 @@ function parseOptions(uri = {}, options) {
     pass        : o.pass || o.password || auth[1] || env.PGPASSWORD || '',
     max         : o.max || url.query.max || Math.max(1, os.cpus().length),
     fifo        : o.fifo || url.query.fifo || false,
-    transform   : o.transform || (x => x),
+    transform   : typeof o.transform === 'function' ? o.transform : null,
     types       : o.types || {},
     ssl         : o.ssl || url.ssl || false,
     timeout     : o.timeout,
diff --git a/tests/index.js b/tests/index.js
@@ -1,8 +1,12 @@
+import { fileURLToPath } from 'url'
 import { t, ot, not } from './test.js'
 import cp from 'child_process'
+import path from 'path'
 
 import postgres from '../lib/index.js'
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+
 const login = {
   user: 'postgres_js_test'
 }
@@ -248,18 +252,12 @@ t('Point type array', async() => {
 }, () => sql`drop table test`)
 
 t('sql file', async() =>
-  [1, (await sql.file('./tests/select.sql'))[0].x]
+  [1, (await sql.file(path.join(__dirname, 'select.sql')))[0].x]
 )
-/*
-t('select column vars', async() => {
-  await sql`create table test (x int)`
-  await sql`insert into test values (1)`
-  return [1, (await sql`select ${ 'x' } from test`)[0].x]
-})
-*/
+
 t('sql file can stream', async() => {
   let result
-  await sql.file('./tests/select.sql')
+  await sql.file(path.join(__dirname, 'select.sql'))
     .stream(({ x }) => result = x)
 
   return [1, result]
@@ -424,3 +422,27 @@ t('big query body', async() => {
   }`).count]
 }, () => sql`drop table test`)
 
+
+/*
+
+
+t('select column vars', async() => {
+  await sql`create table test (x int)`
+  await sql`insert into test values (1)`
+  return [1, (await sql`select ${ 'x' } from test`)[0].x]
+})
+
+t('select column vars', async() => {
+  await sql`create table test (x int)`
+  await sql`insert into test values (1)`
+  return [1, (await sql`select ${ 'x' } from test`)[0].x]
+})
+
+t('select column vars', async() => {
+  await sql`create table test (x int)`
+  await sql`insert into test values (1)`
+  return [1, (await sql`select ${ 'x' } from test`)[0].x]
+})
+
+
+*/
