final lines.

Author: vitaly-t

lib/database.js

@@ -650,7 +650,7 @@ function Database(cn, dc, config) {
          * Custom data streaming, with the help of $[pg-query-stream].
          *
          * This method doesn't work with the $[Native Bindings], and if option `pgNative`
-         * is set, it will reject with `Streaming doesn't work with native bindings.`
+         * is set, it will reject with `Streaming doesn't work with Native Bindings.`
          *
          * @param {QueryStream} qs
          * Stream object of type $[QueryStream].

lib/query.js

@@ -77,7 +77,7 @@ function $query(ctx, query, values, qrm, config) {
 
     if (!error) {
         if (!pgFormatting && !$npm.utils.isText(query)) {
-            error = new Error(isFunc ? "Invalid function name." : "Invalid query format.");
+            error = new TypeError(isFunc ? "Invalid function name." : "Invalid query format.");
         }
         if (query instanceof ExternalQuery) {
             var qp = query.parse();
@@ -94,7 +94,7 @@ function $query(ctx, query, values, qrm, config) {
             qrm = $npm.result.any; // default query result;
         } else {
             if (qrm !== parseInt(qrm) || (qrm & badMask) === badMask || qrm < 1 || qrm > 6) {
-                error = new Error("Invalid Query Result Mask specified.");
+                error = new TypeError("Invalid Query Result Mask specified.");
             }
         }
     }

lib/stream.js

@@ -15,7 +15,7 @@ function $stream(ctx, qs, initCB, config) {
     // istanbul ignore next:
     // we do not provide code coverage for the Native Bindings specifics
     if (ctx.options.pgNative) {
-        return $p.reject(new Error("Streaming doesn't work with native bindings."));
+        return $p.reject(new Error("Streaming doesn't work with Native Bindings."));
     }
     if (!$npm.utils.isObject(qs, ['state', '_reading'])) {
         // stream object wasn't passed in correctly;
@@ -31,6 +31,7 @@ function $stream(ctx, qs, initCB, config) {
     }
     var error = $npm.events.query(ctx.options, getContext());
     if (error) {
+        error = getError(error);
         $npm.events.error(ctx.options, error, getContext());
         return $p.reject(error);
     }
@@ -43,10 +44,10 @@ function $stream(ctx, qs, initCB, config) {
                 if (!err && rows.length) {
                     nRows += rows.length;
                     var context = getContext();
-                    if (error === undefined) {
+                    if (!error) {
                         error = $npm.events.receive(ctx.options, rows, undefined, context);
                     }
-                    if (error !== undefined) {
+                    if (error) {
                         stream.close();
                     }
                 }
@@ -61,6 +62,7 @@ function $stream(ctx, qs, initCB, config) {
     if (error) {
         // error thrown by initCB();
         stream._fetch = fetch;
+        error = getError(error);
         $npm.events.error(ctx.options, error, getContext());
         return $p.reject(error);
     }
@@ -81,14 +83,16 @@ function $stream(ctx, qs, initCB, config) {
             onError(err);
         });
         function onError(e) {
-            if (e instanceof $npm.utils.InternalError) {
-                e = e.error;
-            }
+            e = getError(e);
             $npm.events.error(ctx.options, e, getContext());
             reject(e);
         }
     });
 
+    function getError(e) {
+        return e instanceof $npm.utils.InternalError ? e.error : e;
+    }
+
     function getContext() {
         var client;
         if (ctx.db) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-promise",
-  "version": "4.7.8",
+  "version": "4.8.0",
   "description": "Promises interface for PostgreSQL",
   "main": "lib/index.js",
   "scripts": {