File tree 2 files changed +16
-1
lines changed
2 files changed +16
-1
lines changed Original file line number Diff line number Diff line change @@ -515,7 +515,7 @@ class Client extends EventEmitter {
515
515
query . callback = query . callback || values
516
516
}
517
517
} else {
518
- readTimeout = this . connectionParameters . query_timeout
518
+ readTimeout = config . query_timeout || this . connectionParameters . query_timeout
519
519
query = new Query ( config , values , callback )
520
520
if ( ! query . callback ) {
521
521
result = new this . _Promise ( ( resolve , reject ) => {
Original file line number Diff line number Diff line change @@ -102,6 +102,21 @@ suite.test('query no timeout', (cb) => {
102
102
} )
103
103
} )
104
104
105
+ suite . test ( 'query with timeout on query basis' , ( cb ) => {
106
+ const pool = new pg . Pool ( )
107
+ pool . connect ( ) . then ( ( client ) => {
108
+ client . query (
109
+ { text : 'SELECT pg_sleep(20)' , query_timeout : 1000 } ,
110
+ assert . calls ( function ( err , result ) {
111
+ assert ( err )
112
+ assert ( err . message === 'Query read timeout' )
113
+ client . release ( )
114
+ pool . end ( cb )
115
+ } )
116
+ )
117
+ } )
118
+ } )
119
+
105
120
suite . test ( 'callback API' , ( done ) => {
106
121
const client = new helper . Client ( )
107
122
client . query ( 'CREATE TEMP TABLE peep(name text)' )
You can’t perform that action at this time.
0 commit comments