Revert "merge gql errors and number is number (#1231)"

This reverts commit 2834e03.

Author: MaxAake

packages/bolt-connection/src/bolt/bolt-protocol-v1.js

@@ -45,12 +45,6 @@ const {
   txConfig: { TxConfig }
 } = internal
 
-const DEFAULT_DIAGNOSTIC_RECORD = Object.freeze({
-  OPERATION: '',
-  OPERATION_CODE: '0',
-  CURRENT_SCHEMA: '/'
-})
-
 export default class BoltProtocol {
   /**
    * @callback CreateResponseHandler Creates the response handler
@@ -170,13 +164,6 @@ export default class BoltProtocol {
     return metadata
   }
 
-  enrichErrorMetadata (metadata) {
-    return {
-      ...metadata,
-      diagnostic_record: metadata.diagnostic_record !== null ? { ...DEFAULT_DIAGNOSTIC_RECORD, ...metadata.diagnostic_record } : null
-    }
-  }
-
   /**
    * Perform initialization and authentication of the underlying connection.
    * @param {Object} param

packages/bolt-connection/src/bolt/bolt-protocol-v5x7.js

@@ -31,7 +31,6 @@ import BoltProtocolV5x3 from './bolt-protocol-v5x3'
 import BoltProtocolV5x4 from './bolt-protocol-v5x4'
 import BoltProtocolV5x5 from './bolt-protocol-v5x5'
 import BoltProtocolV5x6 from './bolt-protocol-v5x6'
-import BoltProtocolV5x7 from './bolt-protocol-v5x7'
 // eslint-disable-next-line no-unused-vars
 import { Chunker, Dechunker } from '../channel'
 import ResponseHandler from './response-handler'
@@ -65,7 +64,6 @@ export default function create ({
   const createResponseHandler = protocol => {
     const responseHandler = new ResponseHandler({
       transformMetadata: protocol.transformMetadata.bind(protocol),
-      enrichErrorMetadata: protocol.enrichErrorMetadata.bind(protocol),
       log,
       observer
     })
@@ -249,14 +247,6 @@ function createProtocol (
         log,
         onProtocolError,
         serversideRouting)
-    case 5.7:
-      return new BoltProtocolV5x7(server,
-        chunker,
-        packingConfig,
-        createResponseHandler,
-        log,
-        onProtocolError,
-        serversideRouting)
     default:
       throw newError('Unknown Bolt protocol version: ' + version)
   }

packages/bolt-connection/src/bolt/bolt-protocol-v5x7.transformer.js

@@ -76,7 +76,7 @@ function parseNegotiatedResponse (buffer, log) {
  */
 function newHandshakeBuffer () {
   return createHandshakeMessage([
-    [version(5, 7), version(5, 0)],
+    [version(5, 6), version(5, 0)],
     [version(4, 4), version(4, 2)],
     version(4, 1),
     version(3, 0)

packages/bolt-connection/src/bolt/create.js

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { newError, newGQLError, json } from 'neo4j-driver-core'
+import { newError, json } from 'neo4j-driver-core'
 
 // Signature bytes for each response message type
 const SUCCESS = 0x70 // 0111 0000 // SUCCESS <metadata>
@@ -70,11 +70,10 @@ export default class ResponseHandler {
    * @param {Logger} log The logger
    * @param {ResponseHandler~Observer} observer Object which will be notified about errors
    */
-  constructor ({ transformMetadata, enrichErrorMetadata, log, observer } = {}) {
+  constructor ({ transformMetadata, log, observer } = {}) {
     this._pendingObservers = []
     this._log = log
     this._transformMetadata = transformMetadata || NO_OP_IDENTITY
-    this._enrichErrorMetadata = enrichErrorMetadata || NO_OP_IDENTITY
     this._observer = Object.assign(
       {
         onObserversCountChange: NO_OP,
@@ -116,7 +115,11 @@ export default class ResponseHandler {
           this._log.debug(`S: FAILURE ${json.stringify(msg)}`)
         }
         try {
-          this._currentFailure = this._handleErrorPayload(this._enrichErrorMetadata(payload))
+          const standardizedCode = _standardizeCode(payload.code)
+          const error = newError(payload.message, standardizedCode)
+          this._currentFailure = this._observer.onErrorApplyTransformation(
+            error
+          )
           this._currentObserver.onError(this._currentFailure)
         } finally {
           this._updateCurrentObserver()
@@ -193,23 +196,6 @@ export default class ResponseHandler {
   _resetFailure () {
     this._currentFailure = null
   }
-
-  _handleErrorPayload (payload) {
-    const standardizedCode = _standardizeCode(payload.code)
-    const cause = payload.cause != null ? this._handleErrorCause(payload.cause) : undefined
-    const error = newError(payload.message, standardizedCode, cause, payload.gql_status, payload.description, payload.diagnostic_record)
-    return this._observer.onErrorApplyTransformation(
-      error
-    )
-  }
-
-  _handleErrorCause (payload) {
-    const cause = payload.cause != null ? this._handleErrorCause(payload.cause) : undefined
-    const error = newGQLError(payload.message, cause, payload.gql_status, payload.description, payload.diagnostic_record)
-    return this._observer.onErrorApplyTransformation(
-      error
-    )
-  }
 }
 
 /**

packages/bolt-connection/src/bolt/handshake.js

@@ -441,7 +441,7 @@ export default class ChannelConnection extends Connection {
             reject(error)
           } else {
             const neo4jError = this._handleProtocolError(
-              `Received FAILURE as a response for RESET: ${error}`
+              'Received FAILURE as a response for RESET: ' + error
             )
             reject(neo4jError)
           }