Fix errors during connection

porsager · porsager · commit b56daf4650db · 2019-12-10T23:52:17.000+01:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,7 +4,6 @@
     "node": true,
     "es6": true
   },
-  "parser": "babel-eslint",
   "parserOptions": {
     "ecmaVersion": 9,
     "sourceType": "module"
diff --git a/lib/backend.js b/lib/backend.js
@@ -13,7 +13,8 @@ function Backend({
   onready,
   transform,
   onnotice,
-  onnotify
+  onnotify,
+  error
 }) {
   let rows = 0
 
@@ -119,7 +120,9 @@ function Backend({
   function CopyData() { /* No handling needed until implemented */ }
 
   function ErrorResponse(x) {
-    backend.error = errors.generic(error(x))
+    backend.query
+      ? (backend.error = errors.generic(parseError(x)))
+      : error(errors.generic(parseError(x)))
   }
 
   /* c8 ignore next */
@@ -142,8 +145,8 @@ function Backend({
 
   function NoticeResponse(x) {
     onnotice
-      ? onnotice(error(x))
-      : console.log(error(x)) // eslint-disable-line
+      ? onnotice(parseError(x))
+      : console.log(parseError(x)) // eslint-disable-line
   }
 
   function NoData() { /* No handling needed */ }
@@ -153,7 +156,7 @@ function Backend({
     try {
       type !== 0 && onauth(type, x)
     } catch (err) {
-      backend.error = err
+      error(err)
     }
   }
 
@@ -212,12 +215,12 @@ function Backend({
     backend.error = errors.notSupported('CopyBothResponse')
   }
 
-  function ReadyForQuery(x) {
+  function ReadyForQuery() {
     onready(backend.error)
   }
 }
 
-function error(x) {
+function parseError(x) {
   const error = {}
   let start = 5
   for (let i = 5; i < x.length - 1; i++) {
diff --git a/lib/connection.js b/lib/connection.js
@@ -44,7 +44,8 @@ function Connection(options = {}) {
     onnotify,
     onnotice,
     onready,
-    onauth
+    onauth,
+    error
   })
 
   return connection
@@ -131,7 +132,7 @@ function Connection(options = {}) {
         ? backend.query.result.count
         : backend.query.result))
 
-    backend.error = null
+    backend.query = backend.error = null
     timeout && queries.length === 0 && idle()
 
     if (queries.length === 0 && ended)
