Skip to content

Commit cf21142

Browse files
committed
feat(utils): merge param using JSON.stringify
1 parent 2e44b9b commit cf21142

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

packages/sqlite-utils/src/logger.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ export type LoggerOptions = {
1717
*/
1818
logger: (data: LoggerParams) => void
1919
/**
20-
* whether to merge parameters into sql
20+
* whether to merge parameters into sql, use `JSON.stringify` to serialize params
2121
*
22-
* e.g. from `select ? from ?` to `select name from user`
22+
* e.g. from `select ? from ?` to `select "name" from "user"`
2323
*/
2424
merge?: boolean
2525
/**
2626
* whether to log queryNode
2727
*/
28-
queryNode?: boolean
28+
logQueryNode?: boolean
2929
}
3030

3131
/**
@@ -45,15 +45,15 @@ export type LoggerOptions = {
4545
export function createKyselyLogger(
4646
options: LoggerOptions,
4747
): (event: LogEvent) => void {
48-
const { logger, merge, queryNode } = options
48+
const { logger, merge, logQueryNode } = options
4949

5050
return (event: LogEvent) => {
5151
const { level, queryDurationMillis, query: { parameters, sql, query } } = event
5252
const err = level === 'error' ? event.error : undefined
5353
let _sql = sql.replace(/\r?\n/g, ' ').replace(/\s+/g, ' ')
5454
if (merge) {
5555
parameters.forEach((param) => {
56-
_sql = _sql.replace('?', typeof param === 'string' ? param : JSON.stringify(param))
56+
_sql = _sql.replace('?', JSON.stringify(param))
5757
})
5858
}
5959
const param: LoggerParams = {
@@ -62,7 +62,7 @@ export function createKyselyLogger(
6262
duration: queryDurationMillis,
6363
error: err,
6464
}
65-
if (queryNode) {
65+
if (logQueryNode) {
6666
param.queryNode = query
6767
}
6868
logger(param)

0 commit comments

Comments
 (0)