@@ -8,7 +8,7 @@ import { EXT_CONFIG_NAMESPACE, EXT_NAMESPACE } from '@sqltools/util/constants';
88import generateId from '@sqltools/util/internal-id' ;
99import { default as logger , createLogger } from '@sqltools/log/src' ;
1010import { getDataPath , SESSION_FILES_DIRNAME } from '@sqltools/util/path' ;
11- import { extractConnName , getQueryParameters } from '@sqltools/util/query' ;
11+ import { extractConnName , getQueryParameters , extractCommentVariables } from '@sqltools/util/query' ;
1212import { isEmpty } from '@sqltools/util/validation' ;
1313import Context from '@sqltools/vscode/context' ;
1414import { getOrCreateEditor , getSelectedText , readInput } from '@sqltools/vscode/utils' ;
@@ -220,7 +220,8 @@ export class ConnectionManagerPlugin implements IExtensionPlugin {
220220 const regex = Config [ 'queryParams.regex' ]
221221 const params = getQueryParameters ( query , regex ) ;
222222 if ( params . length > 0 ) {
223- const connVariables = conn . variables || { }
223+ const commentVariables = extractCommentVariables ( query ) ;
224+ const connVariables = { ...conn . variables || { } , ...commentVariables || { } } ;
224225 const connParams = params . filter ( p => p . varName && Object . keys ( connVariables ) . includes ( p . varName ) )
225226 for ( const connParam of connParams ) {
226227 const r = new RegExp ( connParam . param . replace ( / ( [ \$ \[ \] ] ) / g, '\\$1' ) , 'g' ) ;
0 commit comments