Skip to content

Commit

Permalink
Mongo DB null fix (#7)
Browse files Browse the repository at this point in the history
* mongodb null fix

* remove commented qpm() configuration
  • Loading branch information
vi-ssc authored Nov 29, 2022
1 parent afdc547 commit 4b2c47e
Showing 1 changed file with 15 additions and 11 deletions.
26 changes: 15 additions & 11 deletions src/adapters/datasources/datasource-mongodb.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,20 @@ const HIGHWATERMARK = 50

const mongodb = require('mongodb')
const { MongoClient } = mongodb
const { Transform, Writable } = require('stream')
const qpm = require('query-params-mongo')
const processQuery = qpm()
// const processQuery = qpm({
// autoDetect: [{ fieldPattern: /_id$/, dataType: 'objectId' }],
// converters: { objectId: mongodb.ObjectId }
// })

const url = process.env.MONGODB_URL || 'mongodb://localhost:27017'
const configRoot = require('../../config').hostConfig
const { DataSourceMemory } = require("./datasource-memory")
const { Transform, Writable } = require("stream")
const qpm = require("query-params-mongo")
const processQuery = qpm({
autoDetect: [
{ valuePattern: /^null$/i, dataType: 'nullstring' }
],
converters: {
nullstring: val=>{ return { $type: 10 } } // reference BSON datatypes https://www.mongodb.com/docs/manual/reference/bson-types/
}
})

const url = process.env.MONGODB_URL || "mongodb://localhost:27017"
const configRoot = require("../../config").hostConfig
const dsOptions = configRoot.adapters.datasources.DataSourceMongoDb.options || {
runOffline: true,
numConns: 2
Expand Down Expand Up @@ -266,7 +270,7 @@ export class DataSourceMongoDb extends DataSource {

processOptions (param) {
const { options = {}, query = {} } = param
return { ...options, ...processQuery(query) }
return { ...processQuery(query), ...options } // options must overwite the query not otherwise
}

/**
Expand Down

0 comments on commit 4b2c47e

Please sign in to comment.