fixing the primary key insert

invisal · May 3, 2024 · 8a9ed6a · 8a9ed6a
1 parent 44e50e2
commit 8a9ed6a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/gui/src/drivers/base-driver.ts b/gui/src/drivers/base-driver.ts
@@ -152,6 +152,7 @@ interface DatabaseTableOperationInsert {
   operation: "INSERT";
   values: Record<string, DatabaseValue>;
   autoIncrementPkColumn?: string;
+  pk?: string[];
 }
 
 interface DatabaseTableOperationUpdate {

diff --git a/gui/src/drivers/sqlite-base-driver.ts b/gui/src/drivers/sqlite-base-driver.ts
@@ -240,9 +240,25 @@ export abstract class SqliteLikeBaseDriver extends BaseDriver {
             record: selectResult.rows[0],
             lastId: r.lastInsertRowid,
           });
-        }
+        } else if (op.pk && op.pk.length > 0) {
+          const selectStatement = generateSelectOneWithConditionStatement(
+            tableName,
+            op.pk.reduce<Record<string, unknown>>((a, b) => {
+              a[b] = op.values[b];
+              return a;
+            }, {})
+          );
 
-        tmp.push({});
+          // This transform to make it friendly for sending via HTTP
+          const selectResult = await this.query(selectStatement);
+
+          tmp.push({
+            record: selectResult.rows[0],
+            lastId: r.lastInsertRowid,
+          });
+        } else {
+          tmp.push({});
+        }
       }
 
       tmp.push({});

diff --git a/gui/src/lib/sql-execute-helper.ts b/gui/src/lib/sql-execute-helper.ts
@@ -44,6 +44,7 @@ function generateTableChangePlan({
             autoIncrementPkColumn: tableSchema.autoIncrement
               ? tableSchema.pk[0]
               : undefined,
+            pk: tableSchema.pk,
           },
         });
       } else if (row.isRemoved) {