fix update statement when set and where contain same keys

hpoul · hpoul · commit a3c679784030 · 2021-08-03T08:58:09.000+02:00
diff --git a/lib/src/database_access.dart b/lib/src/database_access.dart
@@ -55,21 +55,21 @@ class DatabaseTransactionBase<TABLES extends TablesBase> {
   }) async {
     _assertColumnNames(set);
     _assertColumnNames(where);
-    assert(!where.keys.any((key) => set.containsKey(key)));
+    // assert(!where.keys.any((key) => set.containsKey(key)));
     assert(!where.values.contains(null), 'where values must not be null.');
     assert(!setContainsOptional || set.values.whereType<Optional>().isEmpty);
     if (setContainsOptional) {
       set = flattenOptionals(set);
     }
     final setStatement =
-        set.entries.map((e) => '${e.key} = @${e.key}').join(',');
+        set.entries.map((e) => '${e.key} = @s${e.key}').join(',');
     final whereStatement =
-        where.entries.map((e) => '${e.key} = @${e.key}').join(' AND ');
+        where.entries.map((e) => '${e.key} = @w${e.key}').join(' AND ');
     return await execute(
         'UPDATE $table SET $setStatement WHERE $whereStatement',
         values: {
-          ...set,
-          ...where,
+          ...set.map((key, value) => MapEntry('s$key', value)),
+          ...where.map((key, value) => MapEntry('w$key', value)),
         },
         expectedResultCount: 1);
   }
