Fix performance regression + add async stack to end of error stack

porsager · porsager · commit a74e01534434 · 2020-02-06T09:28:31.000+01:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -114,7 +114,7 @@ function Connection(options = {}) {
     query.result.count = null
     timeout && clearTimeout(timer)
 
-    options.debug && options.debug(id, str, args)
+    typeof options.debug === 'function' && options.debug(id, str, args)
     const buffer = query.simple
       ? simple(str, query)
       : sig in statements
@@ -162,7 +162,7 @@ function Connection(options = {}) {
   function onready(err) {
     if (err) {
       if (backend.query) {
-        err.origin = backend.query.origin
+        err.stack += backend.query.origin.replace(/.*\n/, '\n')
         Object.defineProperty(err, 'query', {
           value: backend.query.str,
           enumerable: false
diff --git a/lib/index.js b/lib/index.js
@@ -35,6 +35,8 @@ Object.assign(Postgres, {
   toKebab
 })
 
+const originCache = new Map()
+
 module.exports = Postgres
 
 function Postgres(a, b) {
@@ -159,7 +161,7 @@ function Postgres(a, b) {
   }
 
   function query(query, connection, xs, args) {
-    query.origin = new Error('Query failed')
+    query.origin = options.debug ? new Error().stack : cachedError(xs)
     if (!query.raw && (!Array.isArray(xs) || !Array.isArray(xs.raw)))
       return nested(xs, args)
 
@@ -178,6 +180,17 @@ function Postgres(a, b) {
     return promise
   }
 
+  function cachedError(xs) {
+    if (originCache.has(xs))
+      return originCache.get(xs)
+
+    const x = Error.stackTraceLimit
+    Error.stackTraceLimit = 4
+    originCache.set(xs, new Error().stack)
+    Error.stackTraceLimit = x
+    return originCache.get(xs)
+  }
+
   function nested(first, rest) {
     const o = Object.create(notPromise)
     o.first = first
diff --git a/tests/index.js b/tests/index.js
@@ -875,10 +875,16 @@ t('numeric is returned as string', async() => [
   typeof (await sql`select 1.2 as x`)[0].x
 ])
 
-t('Error contains origin', async() => [
-  true,
-  (await sql`selec 1`.catch(err => 'origin' in err))
-])
+function get() {
+  return sql`selec 1`
+}
+
+t('Async stack trace', async() => {
+  return [
+    parseInt(new Error().stack.split('\n')[1].split(':')[1]) + 1,
+    parseInt(await sql.begin(sql => sql`select.sql`).catch(x => x.stack.split('\n').pop().split(':')[1]))
+  ]
+})
 
 t('Error contains query string', async() => [
   'selec 1',
