fix: Prevent exception from id column in update queries. (serverpod#3327)

Author: SandPod

packages/serverpod/lib/src/database/adapters/postgres/database_connection.dart

@@ -183,11 +183,11 @@ class DatabaseConnection {
 
     var table = rows.first.table;
 
-    var selectedColumns = columns ?? table.columns;
+    var selectedColumns = (columns ?? table.columns).toSet();
 
     if (columns != null) {
-      _validateColumnsExists(columns, table);
-      selectedColumns = [table.id, ...columns];
+      _validateColumnsExists(selectedColumns, table.columns.toSet());
+      selectedColumns.add(table.id);
     }
 
     var selectedColumnNames = selectedColumns.map((e) => e.columnName);
@@ -198,7 +198,6 @@ class DatabaseConnection {
     var values = _createQueryValueList(rows, selectedColumns);
 
     var setColumns = selectedColumnNames
-        .where((columnName) => columnName != 'id')
         .map((columnName) => '"$columnName" = data."$columnName"')
         .join(', ');
 
@@ -672,15 +671,15 @@ class DatabaseConnection {
     return resolvedListRelations;
   }
 
-  void _validateColumnsExists(List<Column> columns, Table table) {
-    for (var column in columns) {
-      if (!table.columns.any((c) => c.columnName == column.columnName)) {
-        throw ArgumentError.value(
-          column,
-          column.columnName,
-          'does not exist in row',
-        );
-      }
+  void _validateColumnsExists(Set<Column> columns, Set<Column> tableColumns) {
+    var additionalColumns = columns.difference(tableColumns);
+
+    if (additionalColumns.isNotEmpty) {
+      throw ArgumentError.value(
+        additionalColumns.toList().toString(),
+        'columns',
+        'Columns do not exist in table',
+      );
     }
   }
 

tests/serverpod_test_server/test_integration/database_operations/crud/update_test.dart

@@ -782,5 +782,54 @@ void main() async {
 
       expect(updated.first.anEnum, equals(TestEnum.one));
     });
+
+    test(
+        'when listing id column in an update query of a row then update completes successfully.',
+        () async {
+      expect(
+        Types.db.updateRow(session, type, columns: (t) => [t.id]),
+        completes,
+      );
+    });
+  });
+
+  group('Given empty model in database', () {
+    late EmptyModelWithTable model;
+    setUp(() async {
+      model = await EmptyModelWithTable.db
+          .insertRow(session, EmptyModelWithTable());
+    });
+
+    tearDown(() async {
+      await EmptyModelWithTable.db
+          .deleteWhere(session, where: (t) => Constant.bool(true));
+    });
+
+    test('when model is updated then update completes', () async {
+      expect(
+        EmptyModelWithTable.db.updateRow(session, model),
+        completes,
+      );
+    });
+
+    test('when with columns from different model then error is thrown',
+        () async {
+      var invalidColumns = [SimpleData.t.num, Types.t.anInt];
+      expect(
+        EmptyModelWithTable.db
+            .updateRow(session, model, columns: (t) => invalidColumns),
+        throwsA(
+          isA<ArgumentError>()
+              .having(
+                (e) => e.message,
+                'message',
+                equals('Columns do not exist in table'),
+              )
+              .having((e) => e.name, 'name', 'columns')
+              .having((e) => e.invalidValue, 'invalidValue',
+                  invalidColumns.toString()),
+        ),
+      );
+    });
   });
 }