fix: (aurora-data-api) get correct increment primary key for multiple…

… entities inserted Closes: typeorm#7385
coyoteecd · Feb 18, 2021 · a00e130 · a00e130
1 parent 142a6ac
commit a00e130
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/driver/aurora-data-api/AuroraDataApiDriver.ts b/src/driver/aurora-data-api/AuroraDataApiDriver.ts
@@ -655,11 +655,13 @@ export class AuroraDataApiDriver implements Driver {
     /**
      * Creates generated map of values generated or returned by database after INSERT query.
      */
-    createGeneratedMap(metadata: EntityMetadata, insertResult: any) {
+    createGeneratedMap(metadata: EntityMetadata, insertResult: any, entityIndex: number) {
         const generatedMap = metadata.generatedColumns.reduce((map, generatedColumn) => {
             let value: any;
             if (generatedColumn.generationStrategy === "increment" && insertResult.insertId) {
-                value = insertResult.insertId;
+                // NOTE: When multiple rows is inserted by a single INSERT statement,
+                // `insertId` is the value generated for the first inserted row only.
+                value = insertResult.insertId + entityIndex;
             // } else if (generatedColumn.generationStrategy === "uuid") {
             //     console.log("getting db value:", generatedColumn.databaseName);
             //     value = generatedColumn.getEntityValue(uuidMap);

diff --git a/test/github-issues/2131/issue-2131.ts b/test/github-issues/2131/issue-2131.ts
@@ -28,7 +28,7 @@ describe("github issues > #2131 InsertResult return the same primary key", () =>
         async () =>
             (connections = await createTestingConnections({
                 entities: [__dirname + "/entity/*{.js,.ts}"],
-                enabledDrivers: ["sqlite", "mysql"],
+                enabledDrivers: ["sqlite", "mysql", "aurora-data-api"],
             }))
     );
     beforeEach(() => reloadTestingDatabases(connections));