refactor create builder

Author: onlyjackfrost

packages/core/src/lib/data-query/executor.ts

@@ -1,5 +1,6 @@
 import {
   DataSource,
+  IncomingHttpHeaders,
   PrepareParameterFunc,
   RequestParameter,
 } from '@vulcan-sql/core/models';
@@ -12,7 +13,8 @@ export interface IExecutor {
   createBuilder(
     profileName: string,
     query: string,
-    parameterizer: IParameterizer
+    parameterizer: IParameterizer,
+    headers?: IncomingHttpHeaders
   ): Promise<IDataQueryBuilder>;
   prepare: PrepareParameterFunc;
 }
@@ -39,14 +41,15 @@ export class QueryExecutor implements IExecutor {
   public async createBuilder(
     profileName: string,
     query: string,
-    parameterizer: IParameterizer
+    parameterizer: IParameterizer,
+    headers?: IncomingHttpHeaders
   ) {
     return new DataQueryBuilder({
       statement: query,
       parameterizer,
       dataSource: this.dataSourceFactory(profileName)!,
       profileName,
-      headers: {},
+      headers: headers || {},
     });
   }
 }

packages/core/src/lib/template-engine/built-in-extensions/cache/cacheTagRunner.ts

@@ -50,15 +50,14 @@ export class CacheTagRunner extends TagRunner {
     // Set the default vulcan created cache table schema, so we could query the cache table directly, not need user to type schema in the SQL.
     query = `set schema=${vulcanCacheSchemaName};`.concat('\n').concat(query);
     // Create the builder which access "vulcan.cache" data source for cache layer query
+    const headers = metadata.getHeaders();
     const builder = await this.executor.createBuilder(
       cacheProfileName,
       query,
-      parameterizer
+      parameterizer,
+      headers
     );
     context.setVariable(name, builder);
-    // pass header to builder
-    const headers = metadata.getHeaders();
-    if (headers) builder.setHeaders(headers);
 
     // Set parameter back for upstream usage
     context.setVariable(PARAMETERIZER_VAR_NAME, parentParameterizer);

packages/core/src/lib/template-engine/built-in-extensions/query-builder/reqTagRunner.ts

@@ -59,9 +59,9 @@ export class ReqTagRunner extends TagRunner {
       builder = await this.executor.createBuilder(
         profileName,
         query,
-        parameterizer
+        parameterizer,
+        headers
       );
-      if (headers) builder.setHeaders(headers);
       context.setVariable(name, builder);
     }