From 5330f3de9038124b43adc3ab1cd070231f891522 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Fri, 2 Jun 2023 09:04:16 -0500 Subject: [PATCH] Fix merge conflict in update method --- .../qqq/backend/javalin/QJavalinImplementation.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java index 5c4cdb3f..13f6e8d8 100644 --- a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java +++ b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java @@ -615,24 +615,18 @@ public class QJavalinImplementation updateInput.setTableName(tableName); PermissionsHelper.checkTablePermissionThrowing(updateInput, TablePermissionSubType.EDIT); - QTableMetaData tableMetaData = qInstance.getTable(table); + QTableMetaData tableMetaData = qInstance.getTable(tableName); - QJavalinAccessLogger.logStart("update", logPair("table", table), logPair("primaryKey", primaryKey)); + QJavalinAccessLogger.logStart("update", logPair("table", tableName), logPair("primaryKey", primaryKey)); List recordList = new ArrayList<>(); QRecord record = new QRecord(); record.setTableName(tableName); recordList.add(record); + updateInput.setRecords(recordList); record.setValue(tableMetaData.getPrimaryKeyField(), primaryKey); setRecordValuesForInsertOrUpdate(context, tableMetaData, record); - updateInput.setRecords(recordList); - - record.setValue(tableMetaData.getPrimaryKeyField(), primaryKey); - - QJavalinAccessLogger.logStart("update", logPair("table", tableName), logPair("primaryKey", primaryKey)); - - updateInput.setRecords(recordList); UpdateAction updateAction = new UpdateAction(); UpdateOutput updateOutput = updateAction.execute(updateInput);