refactor

Author: ptiurin

src/connection/base.ts

@@ -172,10 +172,10 @@ export abstract class Connection {
 
   abstract cancelAsyncQuery(token: string): Promise<void>;
 
-  async execute(
+  protected async prepareAndExecuteQuery(
     query: string,
-    executeQueryOptions: ExecuteQueryOptions = {}
-  ): Promise<Statement> {
+    executeQueryOptions: ExecuteQueryOptions
+  ): Promise<{ formattedQuery: string; response: Response }> {
     const { httpClient } = this.context;
 
     executeQueryOptions.response = {
@@ -213,14 +213,8 @@ export abstract class Connection {
 
     try {
       const response = await request.ready();
-      const text = await response.text();
       await this.processHeaders(response.headers);
-      await this.throwErrorIfErrorBody(text, response);
-      return new Statement(this.context, {
-        query: formattedQuery,
-        text,
-        executeQueryOptions
-      });
+      return { formattedQuery, response };
     } catch (error) {
       // In case it was a set query, remove set parameter if query fails
       if (setKey.length > 0) {
@@ -232,6 +226,24 @@ export abstract class Connection {
     }
   }
 
+  async execute(
+    query: string,
+    executeQueryOptions: ExecuteQueryOptions = {}
+  ): Promise<Statement> {
+    const { formattedQuery, response } = await this.prepareAndExecuteQuery(
+      query,
+      executeQueryOptions
+    );
+
+    const text = await response.text();
+    await this.throwErrorIfErrorBody(text, response);
+    return new Statement(this.context, {
+      query: formattedQuery,
+      text,
+      executeQueryOptions
+    });
+  }
+
   protected async throwErrorIfErrorBody(text: string, response: Response) {
     // Hack, but looks like this is a limitation of the fetch API
     // In order to read the body here and elesewhere, we need to clone the response

src/connection/connection_v2.ts

@@ -77,44 +77,23 @@ export class ConnectionV2 extends BaseConnection {
     query: string,
     executeQueryOptions: ExecuteQueryOptions = {}
   ): Promise<AsyncStatement> {
-    const { httpClient } = this.context;
-
-    executeQueryOptions.response = {
-      ...defaultResponseSettings,
-      ...(executeQueryOptions.response ?? {})
-    };
-
-    const { parameters, namedParameters } = executeQueryOptions;
-
-    let formattedQuery: string;
-    if (this.queryFormatter.isSetStatement(query)) {
-      // can't have an async set query
-      throw new Error("SET statements cannot be executed asynchronously.");
-    } else {
-      formattedQuery = this.queryFormatter.formatQuery(
-        query,
-        parameters,
-        namedParameters
-      );
-    }
-
-    const body = formattedQuery;
     const asyncExecuteQueryOptions = {
       ...executeQueryOptions,
       settings: {
         ...executeQueryOptions.settings,
         async: true
       }
     };
-    const url = this.getRequestUrl(asyncExecuteQueryOptions);
 
-    const request = httpClient.request<Response>("POST", url, {
-      headers: { "user-agent": this.userAgent },
-      body,
-      raw: true
-    });
+    if (this.queryFormatter.isSetStatement(query)) {
+      // can't have an async set query
+      throw new Error("SET statements cannot be executed asynchronously.");
+    }
+    const { formattedQuery, response } = await this.prepareAndExecuteQuery(
+      query,
+      asyncExecuteQueryOptions
+    );
 
-    const response = await request.ready();
     const text = await response.text();
     await this.throwErrorIfErrorBody(text, response);
     return new AsyncStatement(this.context, {