Simplify slightly

Author: simolus3

crates/core/src/crud_vtab.rs

@@ -4,7 +4,6 @@ use alloc::boxed::Box;
 use alloc::rc::Rc;
 use const_format::formatcp;
 use core::ffi::{CStr, c_char, c_int, c_void};
-use core::mem;
 use serde::Serialize;
 use serde_json::value::RawValue;
 
@@ -227,7 +226,7 @@ impl VirtualTable {
     }
 
     fn end_transaction(&mut self) {
-        if let Some(tx) = mem::take(&mut self.current_tx) {
+        if let Some(tx) = self.current_tx.take() {
             if tx.observed_begin {
                 self.state.current_transaction_id.set(None);
             }

dart/test/crud_test.dart

@@ -1022,21 +1022,26 @@ INSERT INTO ps_kv(key, value) VALUES
         });
       }
 
-      test('for writes in both types of tables', () {
-        for (var tx = 1; tx < 10; tx++) {
-          db.execute('BEGIN');
-          for (var i = 0; i < tx; i++) {
-            db.execute('INSERT INTO regular (id, a) VALUES (uuid(), 1234)');
-            db.execute('INSERT INTO insertonly (id, a) VALUES (uuid(), 1234)');
-          }
-          db.execute('COMMIT');
+      for (final (first, second) in [
+        ('regular', 'insertonly'),
+        ('insertonly', 'regular')
+      ]) {
+        test('write $first then $second', () {
+          for (var tx = 1; tx < 10; tx++) {
+            db.execute('BEGIN');
+            for (var i = 0; i < tx; i++) {
+              db.execute('INSERT INTO $first (id, a) VALUES (uuid(), 1234)');
+              db.execute('INSERT INTO $second (id, a) VALUES (uuid(), 1234)');
+            }
+            db.execute('COMMIT');
 
-          expect(
-            db.select('SELECT * FROM ps_crud WHERE tx_id = ?', [tx]),
-            hasLength(tx * 2),
-          );
-        }
-      });
+            expect(
+              db.select('SELECT * FROM ps_crud WHERE tx_id = ?', [tx]),
+              hasLength(tx * 2),
+            );
+          }
+        });
+      }
     });
   });
 }