xardao 1.3.0 → 1.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/common.js +2 -3
- package/lib/driver_mssql.js +1 -2
- package/package.json +1 -1
package/lib/common.js
CHANGED
|
@@ -126,9 +126,8 @@ exports.mergeParams = function(cn,sql, params) {
|
|
|
126
126
|
rt.push(isql.substring(0, p))
|
|
127
127
|
let fn = /@(\w+)/i.exec(isql)
|
|
128
128
|
let v = uparams[fn[1].toLowerCase()]
|
|
129
|
-
if ( v === undefined )
|
|
130
|
-
|
|
131
|
-
rt.push(cn.sqlParam(v))
|
|
129
|
+
if ( v === undefined ) rt.push(fn[0])
|
|
130
|
+
else rt.push(cn.sqlParam(v))
|
|
132
131
|
isql = isql.substring(p+fn[0].length)
|
|
133
132
|
}
|
|
134
133
|
}
|
package/lib/driver_mssql.js
CHANGED
|
@@ -199,14 +199,13 @@ class Connection {
|
|
|
199
199
|
var self = this
|
|
200
200
|
var useSnakeCase = false
|
|
201
201
|
var useCamelCase = false
|
|
202
|
-
var dbconn = this.db
|
|
203
202
|
if ( params.options ) {
|
|
204
203
|
useSnakeCase = params.options.useSnakeCase || false
|
|
205
204
|
useCamelCase = params.options.useCamelCase || false
|
|
206
205
|
}
|
|
207
206
|
|
|
208
207
|
this.debug("getObjects",realSql)
|
|
209
|
-
let ret =
|
|
208
|
+
let ret = undefined
|
|
210
209
|
let fields = []
|
|
211
210
|
let headersRead = false
|
|
212
211
|
let request = new mssql.Request(realSql, function(err, rows, fields) {
|