...

Author: igalklebanov

src/dialect/mysql/mysql-dialect-config.ts

@@ -53,6 +53,7 @@ export interface MysqlPoolConnection {
     callback: (error: unknown, result: MysqlQueryResult) => void,
   ): void
   release(): void
+  threadId: number
 }
 
 export interface MysqlStreamOptions {

src/dialect/mysql/mysql-driver.ts

@@ -166,7 +166,6 @@ function isOkPacket(obj: unknown): obj is MysqlOkPacket {
 
 class MysqlConnection implements DatabaseConnection {
   readonly #rawConnection: MysqlPoolConnection
-  #cid: unknown
 
   constructor(rawConnection: MysqlPoolConnection) {
     this.#rawConnection = rawConnection
@@ -175,12 +174,6 @@ class MysqlConnection implements DatabaseConnection {
   async cancelQuery(
     controlConnectionProvider: ControlConnectionProvider,
   ): Promise<void> {
-    if (!this.#cid) {
-      return logOnce(
-        'kysely:warning: cannot cancel query because the connection has not been made cancelable.',
-      )
-    }
-
     try {
       // this removes the connection from the pool.
       // this is done to avoid picking it up after the `kill` command next, which
@@ -196,20 +189,13 @@ class MysqlConnection implements DatabaseConnection {
       // guarantee that the query is killed immediately. we saw that in tests,
       // the query can still run for a while after - including registering writes.
       await controlConnection.executeQuery(
-        CompiledQuery.raw('kill connection ?', [this.#cid]),
+        CompiledQuery.raw('kill connection ?', [this.#rawConnection.threadId]),
       )
     })
   }
 
-  async executeQuery<O>(
-    compiledQuery: CompiledQuery,
-    options?: QueryOptions,
-  ): Promise<QueryResult<O>> {
+  async executeQuery<O>(compiledQuery: CompiledQuery): Promise<QueryResult<O>> {
     try {
-      if (options?.cancelable) {
-        await this.#setupCancelability()
-      }
-
       const result = await this.#executeQuery(compiledQuery)
 
       if (!isOkPacket(result)) {
@@ -247,10 +233,6 @@ class MysqlConnection implements DatabaseConnection {
     _chunkSize: number,
     options?: QueryOptions,
   ): AsyncIterableIterator<QueryResult<O>> {
-    if (options?.cancelable) {
-      await this.#setupCancelability()
-    }
-
     const stream = this.#rawConnection
       .query(compiledQuery.sql, compiledQuery.parameters)
       .stream<O>({ objectMode: true })
@@ -295,16 +277,4 @@ class MysqlConnection implements DatabaseConnection {
       )
     })
   }
-
-  async #setupCancelability(): Promise<void> {
-    if (this.#cid) {
-      return
-    }
-
-    const results = await this.#executeQuery(
-      CompiledQuery.raw('select connection_id() as cid', []),
-    )
-
-    this.#cid = (results as any[])[0]?.cid
-  }
 }