[CONJS-215] Executing after prepare close throw a wrong error

Author: rusher

lib/cmd/class/prepare-result-packet.js

@@ -1,5 +1,6 @@
 'use strict';
 const CommandParameter = require('../../command-parameter');
+const Errors = require('../../misc/errors');
 
 /**
  * Prepare result
@@ -28,6 +29,24 @@ class PrepareResultPacket {
       _cb = _opts;
       _opts = undefined;
     }
+
+    if (this.closed) {
+      const error = Errors.createError(
+        `Execute fails, prepare command as already been closed`,
+        Errors.ER_PREPARE_CLOSED,
+        null,
+        '22000',
+        this.query
+      );
+
+      if (!_cb) {
+        return Promise.reject(error);
+      } else {
+        _cb(error);
+        return;
+      }
+    }
+
     const cmdParam = new CommandParameter(this.query, values, _opts, cb);
     if (stack) cmdParam.stack = stack;
     const promise = new Promise((resolve, reject) => this.#connExecutePromise(cmdParam, this, resolve, reject));

lib/misc/errors.js

@@ -132,6 +132,7 @@ module.exports.ER_NOT_SUPPORTED_AUTH_PLUGIN = 45047;
 module.exports.ER_COMPRESSION_NOT_SUPPORTED = 45048;
 module.exports.ER_UNDEFINED_SQL = 45049;
 module.exports.ER_PARSING_PRECISION = 45050;
+module.exports.ER_PREPARE_CLOSED = 45051;
 
 const keys = Object.keys(module.exports);
 const errByNo = {};

test/integration/test-execute-callback.js

@@ -124,6 +124,79 @@ describe('prepare and execute callback', () => {
     });
   });
 
+  it('prepare after prepare close - no cache', (done) => {
+    const conn = base.createCallbackConnection({ prepareCacheLength: 0 });
+    conn.connect((err) => {
+      if (err) return done(err);
+      conn.prepare('select ?', (err, prepare) => {
+        prepare.execute('1', (res) => {
+          prepare.close();
+          prepare.execute('1', (err, res) => {
+            if (!err) {
+              done(new Error('must have thrown error'));
+            } else {
+              assert.isTrue(err.message.includes('Execute fails, prepare command as already been closed'));
+              conn.prepare('select ?', (err, prepare2) => {
+                if (err) {
+                  done(err);
+                } else {
+                  prepare2.execute('1', (res) => {
+                    prepare2.close();
+                    conn.end();
+                    done();
+                  });
+                }
+              });
+            }
+          });
+        });
+      });
+    });
+  });
+
+  it('prepare after prepare close - with cache', (done) => {
+    const conn = base.createCallbackConnection({ prepareCacheLength: 2 });
+    conn.connect((err) => {
+      if (err) return done(err);
+      conn.prepare('select ?', (err, prepare) => {
+        prepare.execute('1', (res) => {
+          prepare.close();
+          prepare.execute('1', (err, res) => {
+            if (err) {
+              done(err);
+            } else {
+              //remove from cache
+              conn.execute('select 1, ?', ['2']);
+              conn.execute('select 2, ?', ['2']);
+              conn.execute('select 3, ?', ['2']);
+              conn.execute('select 4, ?', ['2'], (err, res) => {
+                //removed from cache, must really be closed
+                prepare.execute('1', (err, res) => {
+                  if (!err) {
+                    done(new Error('must have thrown error'));
+                  } else {
+                    assert.isTrue(err.message.includes('Execute fails, prepare command as already been closed'));
+                    conn.prepare('select ?', (err, prepare2) => {
+                      if (err) {
+                        done(err);
+                      } else {
+                        prepare2.execute('1', (res) => {
+                          prepare2.close();
+                          conn.end();
+                          done();
+                        });
+                      }
+                    });
+                  }
+                });
+              });
+            }
+          });
+        });
+      });
+    });
+  });
+
   it('prepare cache reuse', (done) => {
     const conn = base.createCallbackConnection({ prepareCacheLength: 2 });
     conn.connect((err) => {

test/integration/test-execute.js

@@ -73,6 +73,54 @@ describe('prepare and execute', () => {
     conn.end();
   });
 
+  it('prepare after prepare close - no cache', async () => {
+    const conn = await base.createConnection({ prepareCacheLength: 0 });
+    const prepare = await conn.prepare('select ?');
+    await prepare.execute('1');
+    await prepare.close();
+    try {
+      await prepare.execute('1');
+      throw new Error('must have thrown error');
+    } catch (e) {
+      assert.isTrue(e.message.includes('Execute fails, prepare command as already been closed'));
+    }
+
+    const prepare2 = await conn.prepare('select ?');
+    await prepare2.execute('2');
+    await prepare2.close();
+
+    conn.end();
+  });
+
+  it('prepare after prepare close - with cache', async () => {
+    const conn = await base.createConnection({ prepareCacheLength: 2 });
+    const prepare = await conn.prepare('select ?');
+    await prepare.execute('1');
+    await prepare.close();
+
+    //in cache, so must still work
+    await prepare.execute('1');
+
+    await conn.execute('select 1, ?', ['2']);
+    await conn.execute('select 2, ?', ['2']);
+    await conn.execute('select 3, ?', ['2']);
+    await conn.execute('select 4, ?', ['2']);
+
+    //removed from cache, must really be closed
+    try {
+      await prepare.execute('1');
+      throw new Error('must have thrown error');
+    } catch (e) {
+      assert.isTrue(e.message.includes('Execute fails, prepare command as already been closed'));
+    }
+    //not in cache, so re-prepare
+    const prepare2 = await conn.prepare('select ?');
+    await prepare2.execute('2');
+    await prepare2.close();
+
+    conn.end();
+  });
+
   it('prepare cache reuse', async () => {
     const conn = await base.createConnection({ prepareCacheLength: 2 });
     let prepare = await conn.prepare('select ?', [1]);