Use native finalizers for arguments

Author: simolus3

sqlite3/assets/sqlite3.h

@@ -68,12 +68,12 @@ sqlite3_char *sqlite3_column_name(sqlite3_stmt *pStmt, int N);
 sqlite3_char *sqlite3_column_table_name(sqlite3_stmt *pStmt, int N);
 
 int sqlite3_bind_blob64(sqlite3_stmt *pStmt, int index, void *data,
-                        uint64_t length, void *destructor);
+                        uint64_t length, void(*destructor)(void*));
 int sqlite3_bind_double(sqlite3_stmt *pStmt, int index, double data);
 int sqlite3_bind_int64(sqlite3_stmt *pStmt, int index, int64_t data);
 int sqlite3_bind_null(sqlite3_stmt *pStmt, int index);
 int sqlite3_bind_text(sqlite3_stmt *pStmt, int index, sqlite3_char *data,
-                      int length, void *destructor);
+                      int length, void(*destructor)(void*));
 
 void *sqlite3_column_blob(sqlite3_stmt *pStmt, int iCol);
 double sqlite3_column_double(sqlite3_stmt *pStmt, int iCol);

sqlite3/lib/src/ffi/bindings.dart

@@ -6,7 +6,6 @@ import 'dart:ffi';
 import 'dart:typed_data';
 
 import 'package:ffi/ffi.dart' as ffi;
-import 'package:meta/meta.dart';
 
 import '../constants.dart';
 import '../exception.dart';
@@ -1131,34 +1130,23 @@ final class FfiStatement implements RawSqliteStatement, Finalizable {
   final Pointer<sqlite3_stmt> stmt;
   final Object _detachToken = Object();
 
-  final List<Pointer> _allocatedArguments = [];
-
   FfiStatement(this.stmt) {
     statementFinalizer.attach(this, stmt.cast(), detach: _detachToken);
   }
 
-  @visibleForTesting
-  List<Pointer> get allocatedArguments => _allocatedArguments;
-
   @override
-  void deallocateArguments() {
-    for (final arg in _allocatedArguments) {
-      arg.free();
-    }
-    _allocatedArguments.clear();
-  }
+  void deallocateArguments() {}
 
   @override
   int sqlite3_bind_blob64(int index, List<int> value) {
     final ptr = allocateBytes(value);
-    _allocatedArguments.add(ptr);
 
     return libsqlite3.sqlite3_bind_blob64(
       stmt,
       index,
       ptr.cast(),
       value.length,
-      nullPtr(),
+      allocate.nativeFree,
     );
   }
 
@@ -1211,14 +1199,13 @@ final class FfiStatement implements RawSqliteStatement, Finalizable {
   int sqlite3_bind_text(int index, String value) {
     final bytes = utf8.encode(value);
     final ptr = allocateBytes(bytes);
-    _allocatedArguments.add(ptr);
 
     return libsqlite3.sqlite3_bind_text(
       stmt,
       index,
       ptr.cast(),
       bytes.length,
-      nullPtr(),
+      allocate.nativeFree,
     );
   }
 

sqlite3/lib/src/ffi/libsqlite3.g.dart

@@ -250,15 +250,16 @@ external ffi.Pointer<sqlite3_char> sqlite3_column_table_name(
     ffi.Int,
     ffi.Pointer<ffi.Void>,
     ffi.Uint64,
-    ffi.Pointer<ffi.Void>,
+    ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>,
   )
 >()
 external int sqlite3_bind_blob64(
   ffi.Pointer<sqlite3_stmt> pStmt,
   int index,
   ffi.Pointer<ffi.Void> data,
   int length,
-  ffi.Pointer<ffi.Void> destructor,
+  ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>
+  destructor,
 );
 
 @ffi.Native<ffi.Int Function(ffi.Pointer<sqlite3_stmt>, ffi.Int, ffi.Double)>()
@@ -284,15 +285,16 @@ external int sqlite3_bind_null(ffi.Pointer<sqlite3_stmt> pStmt, int index);
     ffi.Int,
     ffi.Pointer<sqlite3_char>,
     ffi.Int,
-    ffi.Pointer<ffi.Void>,
+    ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>,
   )
 >()
 external int sqlite3_bind_text(
   ffi.Pointer<sqlite3_stmt> pStmt,
   int index,
   ffi.Pointer<sqlite3_char> data,
   int length,
-  ffi.Pointer<ffi.Void> destructor,
+  ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>
+  destructor,
 );
 
 @ffi.Native<

sqlite3/lib/src/wasm/sqlite3_wasm.g.dart

@@ -83,7 +83,7 @@ extension type SqliteExports(JSObject raw) implements JSObject {
     int index,
     Pointer /*<void *>*/ data,
     JSBigInt length,
-    Pointer /*<void *>*/ destructor,
+    Pointer /*<void  (*)(void * )*>*/ destructor,
   );
   external int sqlite3_bind_double(
     Pointer /*<struct sqlite3_stmt *>*/ pStmt,
@@ -104,7 +104,7 @@ extension type SqliteExports(JSObject raw) implements JSObject {
     int index,
     Pointer /*<struct sqlite3_char *>*/ data,
     int length,
-    Pointer /*<void *>*/ destructor,
+    Pointer /*<void  (*)(void * )*>*/ destructor,
   );
   external Pointer /*<void *>*/ sqlite3_column_blob(
     Pointer /*<struct sqlite3_stmt *>*/ pStmt,

sqlite3/test/ffi/prepared_statement_test.dart

@@ -2,7 +2,6 @@
 library;
 
 import 'package:sqlite3/sqlite3.dart';
-import 'package:sqlite3/src/ffi/implementation.dart';
 import 'package:test/test.dart';
 
 import '../common/prepared_statement.dart';
@@ -12,35 +11,4 @@ void main() {
   final hasReturning = version.versionNumber > 3035000;
 
   testPreparedStatements(() => sqlite3, supportsReturning: hasReturning);
-
-  group('deallocates statement arguments', () {
-    late Database database;
-
-    setUp(() => database = sqlite3.openInMemory());
-    tearDown(() => database.dispose());
-
-    test('after binding different args', () {
-      final stmt = database.prepare('SELECT ?;');
-      stmt.execute(['this needs to be allocated and copied into ffi buffer']);
-      expect(
-        (stmt as FfiStatementImplementation).ffiStatement.allocatedArguments,
-        isNotEmpty,
-      );
-
-      stmt.execute([3]);
-      expect(stmt.ffiStatement.allocatedArguments, isEmpty);
-    });
-
-    test('after disposing statement', () {
-      final stmt = database.prepare('SELECT ?;');
-      stmt.execute(['this needs to be allocated and copied into ffi buffer']);
-      expect(
-        (stmt as FfiStatementImplementation).ffiStatement.allocatedArguments,
-        isNotEmpty,
-      );
-
-      stmt.dispose();
-      expect(stmt.ffiStatement.allocatedArguments, isEmpty);
-    });
-  });
 }