Merge pull request #6 from txase/fixes

Fixes

Author: txase

index.js

@@ -15,9 +15,9 @@ function getAuroraDataValue (value) {
     return value.longValue;
   } else if ('stringValue' in value) {
     return value.stringValue;
-  } else if ('booleanValue' in value) {
+  } else /* istanbul ignore else */ if ('booleanValue' in value) {
     return value.booleanValue;
-  } else /* istanbul ignore next */ {
+  } else {
     const type = Object.keys(value)[0];
     throw new Error(`Unknown value type '${type}' from row`);
   }
@@ -41,16 +41,6 @@ function hydrateRecord (record, fields) {
         value = new Date(value + 'Z');
         break;
 
-      case 'CHAR':
-        if (field.precision === 5) {
-          // ENUM ?
-          break;
-        } else if (field.precision === 13) {
-          // SET ?
-          value = new Set(value.split(','));
-        }
-        break;
-
       default:
         break;
     }
@@ -90,22 +80,33 @@ class Client_AuroraDataMySQL extends Client_MySQL { // eslint-disable-line camel
     return new RDSDataService(config);
   }
 
-  acquireRawConnection () {
-    return {
-      client: this.driver,
-      parameters: {
-        // common parameters for Data API requests
-        database: this.config.connection.database,
-        resourceArn: this.config.connection.resourceArn,
-        secretArn: this.config.connection.secretArn
-      }
-    };
-  }
+  initializePool() {
+    /* istanbul ignore if */
+    if (this.pool) {
+      this.logger.warn('The pool has already been initialized');
+      return;
+    }
 
-  destroyRawConnection (connection) {}
+    this.knexUid = 0;
 
-  validateConnection (connection) {
-    return true;
+    // common parameters for Data API requests
+    const parameters = {
+      database: this.config.connection.database,
+      resourceArn: this.config.connection.resourceArn,
+      secretArn: this.config.connection.secretArn
+    };
+
+    this.pool = {
+      acquire: () => ({
+        promise: Promise.resolve({
+          client: this.driver,
+          parameters,
+          __knexUid: this.knexUid++
+        })
+      }),
+      release: () => true,
+      destroy: () => true
+    };
   }
 
   prepBindings (bindings) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex-aurora-data-api-mysql",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Knex.js driver for MySQL AWS Aurora Data API",
   "homepage": "https://github.com/txase/knex-aurora-data-api-mysql",
   "repository": "txase/knex-aurora-data-api-mysql",

tests/constants.js

@@ -426,7 +426,7 @@ module.exports = {
       blob: Buffer.from([98, 108, 111, 103]),
       text: 'test',
       enum: 'one',
-      set: new Set(['one', 'two']),
+      set: 'one,two',
       null: null,
       bool: true
     }
@@ -2122,6 +2122,12 @@ module.exports = {
   },
   PLUCK_RESPONSE_ROWS: [1, 2],
 
+  DEL_RESPONSE_DATA: {
+    generatedFields: [],
+    numberOfRecordsUpdated: 7
+  },
+  DEL_RESPONSE_ROWS: 7,
+
   INSERT_RESPONSE_DATA: {
     generatedFields: [
       {

tests/test.js

@@ -103,6 +103,27 @@ describe('SDK configuration tests', () => {
   });
 });
 
+test('Destroy functionality', async () => {
+  const knex = require('knex')({
+    client: require('..'),
+    connection: {
+      database: constants.DATABASE,
+      resourceArn: constants.AURORA_CLUSTER_ARN,
+      secretArn: constants.SECRET_ARN
+    }
+  });
+
+  mockExecuteStatementPromise.mockResolvedValue(constants.ALL_QUERY_RESPONSE_DATA);
+
+  await knex.select('*').from('foo');
+
+  expect(mockExecuteStatement).toHaveBeenCalledTimes(1);
+
+  knex.destroy();
+
+  await expect(knex.select('*').from('foo')).rejects.toThrow();
+});
+
 describe('Query statement tests', () => {
   const knex = require('knex')({
     client: require('..'),
@@ -300,6 +321,24 @@ describe('Query statement tests', () => {
     expect(rows).toEqual(constants.PLUCK_RESPONSE_ROWS);
   });
 
+  test('.del() works', async () => {
+    mockExecuteStatementPromise.mockResolvedValue(constants.DEL_RESPONSE_DATA);
+
+    const rows = await knex('test').del();
+
+    expect(mockExecuteStatement).toHaveBeenCalledTimes(1);
+    expect(mockExecuteStatement).toHaveBeenCalledWith({
+      resourceArn: constants.AURORA_CLUSTER_ARN,
+      secretArn: constants.SECRET_ARN,
+      database: constants.DATABASE,
+      sql: 'delete from `test`',
+      parameters: [],
+      includeResultMetadata: true
+    });
+
+    expect(rows).toEqual(constants.DEL_RESPONSE_ROWS);
+  });
+
   test("Insert returns first row's primary ID", async () => {
     mockExecuteStatementPromise.mockResolvedValue(constants.INSERT_RESPONSE_DATA);