Merge pull request #8 from txase/handleNonGeneratedIds

Handle non generated ids

Author: txase

index.js

@@ -246,7 +246,11 @@ class Client_AuroraDataMySQL extends Client_MySQL { // eslint-disable-line camel
         return method === 'first' ? rows[0] : rows;
       }
       case 'insert':
-        return [getAuroraDataValue(generatedFields[0])];
+        if (generatedFields.length > 0) {
+          return [getAuroraDataValue(generatedFields[0])];
+        } else {
+          return [undefined];
+        }
       case 'del':
       case 'update':
       case 'counter':

package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex-aurora-data-api-mysql",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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

@@ -2158,6 +2158,12 @@ module.exports = {
   },
   INSERT_RESPONSE_ROWS: [33],
 
+  INSERT_RESPONSE_WITHOUT_LAST_ID_DATA: {
+    generatedFields: [],
+    numberOfRecordsUpdated: 2
+  },
+  INSERT_RESPONSE_WITHOUT_LAST_ID_ROWS: [undefined],
+
   UPDATE_RESPONSE_DATA: {
     generatedFields: [],
     numberOfRecordsUpdated: 3

tests/test.js

@@ -379,6 +379,40 @@ describe('Query statement tests', () => {
     expect(inserted).toEqual(constants.INSERT_RESPONSE_ROWS);
   });
 
+  test('Insert returns undefined primary ID when not generated', async () => {
+    mockExecuteStatementPromise.mockResolvedValue(constants.INSERT_RESPONSE_WITHOUT_LAST_ID_DATA);
+
+    const inserted = await knex('test').insert([
+      { int: 33 },
+      { int: 34 }
+    ]);
+
+    expect(mockExecuteStatement).toHaveBeenCalledTimes(1);
+    expect(mockExecuteStatement).toHaveBeenCalledWith({
+      resourceArn: constants.AURORA_CLUSTER_ARN,
+      secretArn: constants.SECRET_ARN,
+      database: constants.DATABASE,
+      sql: 'insert into `test` (`int`) values (:0), (:1)',
+      parameters: [
+        {
+          name: '0',
+          value: {
+            longValue: 33
+          }
+        },
+        {
+          name: '1',
+          value: {
+            longValue: 34
+          }
+        }
+      ],
+      includeResultMetadata: true
+    });
+
+    expect(inserted).toEqual(constants.INSERT_RESPONSE_WITHOUT_LAST_ID_ROWS);
+  });
+
   test('Update returns number of rows updated', async () => {
     mockExecuteStatementPromise.mockResolvedValue(constants.UPDATE_RESPONSE_DATA);