fix: Change sql property to query for errors (#611)

cap-js · Apr 25, 2024 · 585577a · 585577a
1 parent 05babcf
commit 585577a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/hana/lib/drivers/base.js b/hana/lib/drivers/base.js
@@ -203,9 +203,9 @@ const formatPrivilegeError = function (row) {
   return `MISSING ${GRANT}${row.PRIVILEGE} ON ${row.SCHEMA_NAME}.${row.OBJECT_NAME}`
 }
 
-const enhanceError = function (err, stack, sql, message) {
+const enhanceError = function (err, stack, query, message) {
   return Object.assign(err, stack, {
-    sql,
+    query,
     message: message ? message : err.message,
   })
 }

diff --git a/postgres/lib/PostgresService.js b/postgres/lib/PostgresService.js
@@ -144,34 +144,45 @@ GROUP BY k
       text: sql,
       name: sha,
     }
+
+    const enhanceError = (err, sql) => Object.assign(err, { query: sql + '\n' + new Array(err.position).fill(' ').join('') + '^' })
+
     return {
       run: async values => {
-        // REVISIT: SQLService provides empty values as {} for plain SQL statements - PostgreSQL driver expects array or nothing - see issue #78
-        let newQuery = this._prepareStreams(query, values)
-        if (typeof newQuery.then === 'function') newQuery = await newQuery
-        const result = await this.dbc.query(newQuery)
-        return { changes: result.rowCount }
+        try {
+          // REVISIT: SQLService provides empty values as {} for plain SQL statements - PostgreSQL driver expects array or nothing - see issue #78
+          let newQuery = this._prepareStreams(query, values)
+          if (typeof newQuery.then === 'function') newQuery = await newQuery
+          const result = await this.dbc.query(newQuery)
+          return { changes: result.rowCount }
+        } catch (e) {
+          throw enhanceError(e, sql)
+        }
       },
       get: async values => {
-        // REVISIT: SQLService provides empty values as {} for plain SQL statements - PostgreSQL driver expects array or nothing - see issue #78
-        const result = await this.dbc.query({ ...query, values: this._getValues(values) })
-        return result.rows[0]
+        try {
+          // REVISIT: SQLService provides empty values as {} for plain SQL statements - PostgreSQL driver expects array or nothing - see issue #78
+          const result = await this.dbc.query({ ...query, values: this._getValues(values) })
+          return result.rows[0]
+        } catch (e) {
+          throw enhanceError(e, sql)
+        }
       },
       all: async values => {
         // REVISIT: SQLService provides empty values as {} for plain SQL statements - PostgreSQL driver expects array or nothing - see issue #78
         try {
           const result = await this.dbc.query({ ...query, values: this._getValues(values) })
           return result.rows
         } catch (e) {
-          throw Object.assign(e, { sql: sql + '\n' + new Array(e.position).fill(' ').join('') + '^' })
+          throw enhanceError(e, sql)
         }
       },
       stream: async (values, one) => {
         try {
           const streamQuery = new QueryStream({ ...query, values: this._getValues(values) }, one)
           return await this.dbc.query(streamQuery)
         } catch (e) {
-          throw Object.assign(e, { sql: sql + '\n' + new Array(e.position).fill(' ').join('') + '^' })
+          throw enhanceError(e, sql)
         }
       },
     }
@@ -206,8 +217,7 @@ GROUP BY k
           sql = sql.replace(
             new RegExp(`\\$${i + 1}`, 'g'),
             // Don't ask about the dollar signs
-            `(SELECT ${isBinary ? `DECODE(PARAM,'base64')` : 'PARAM'} FROM "$$$$PARAMETER_BUFFER$$$$" WHERE NAME='${
-              query.name
+            `(SELECT ${isBinary ? `DECODE(PARAM,'base64')` : 'PARAM'} FROM "$$$$PARAMETER_BUFFER$$$$" WHERE NAME='${query.name
             }' AND ID=$${i + 1})`,
           )
           return
@@ -565,7 +575,7 @@ GROUP BY k
       // Create new schema using schema owner
       await this.tx(async tx => {
         await tx.run(`DROP SCHEMA IF EXISTS "${creds.schema}" CASCADE`)
-        if (!clean) await tx.run(`CREATE SCHEMA "${creds.schema}" AUTHORIZATION "${creds.user}"`).catch(() => {})
+        if (!clean) await tx.run(`CREATE SCHEMA "${creds.schema}" AUTHORIZATION "${creds.user}"`).catch(() => { })
       })
     } finally {
       await this.disconnect()
@@ -593,7 +603,7 @@ class QueryStream extends Query {
           })
           this.connection.flush()
         }
-        : () => {},
+        : () => { },
     })
     this.push = this.stream.push.bind(this.stream)
 
@@ -708,7 +718,7 @@ class ParameterStream extends Writable {
   }
 
   // Used by the client to handle timeouts
-  callback() {}
+  callback() { }
 
   _write(chunk, enc, cb) {
     return this.flush(chunk, cb)

diff --git a/sqlite/lib/SQLiteService.js b/sqlite/lib/SQLiteService.js
@@ -80,7 +80,7 @@ class SQLiteService extends SQLService {
         stream: (..._) => this._stream(stmt, ..._),
       }
     } catch (e) {
-      e.message += ' in:\n' + (e.sql = sql)
+      e.message += ' in:\n' + (e.query = sql)
       throw e
     }
   }