insertManyReturning in transaction and fix didGenerate for Insert

juancastillo0 · Dec 8, 2023 · 4144ec7 · 4144ec7
1 parent 854e18e
commit 4144ec7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/packages/wasm_packages/sql_parser/typesql/lib/src/sql_executor.dart b/packages/wasm_packages/sql_parser/typesql/lib/src/sql_executor.dart
@@ -329,10 +329,20 @@ class SqlTypedController<T extends SqlReturnModel,
   Future<SqlExecution> insertMany(List<SqlInsertModel<T>> models) =>
       SqlExec.insertMany(type, models).run(executor.executor);
 
-  Future<List<T>> insertManyReturning(List<SqlInsertModel<T>> models) =>
-      SqlExec.insertMany(type, models)
+  Future<List<T>> insertManyReturning(List<SqlInsertModel<T>> models) async {
+    if (models.isEmpty) {
+      return [];
+    } else if (models.length == 1) {
+      return SqlExec.insertMany(type, models, useDefault: false)
           .addReturning(type)
           .run(executor.executor);
+    } else {
+      final result = await executor.executor.transaction(() {
+        return Future.wait(models.map(insertReturning));
+      });
+      return result!;
+    }
+  }
 
   Future<T?> updateReturning(SqlUniqueKeyModel<T, U> key, U model) =>
       SqlExec.update(key, model)

diff --git a/packages/wasm_packages/sql_parser/typesql_generator/example/typesql_generator_example.dart b/packages/wasm_packages/sql_parser/typesql_generator/example/typesql_generator_example.dart
@@ -135,7 +135,7 @@ class SqliteExecutor extends SqlExecutor {
   Future<T?> transaction<T>(Future<T> Function() transact) async {
     bool started = false;
     try {
-      db.execute('START TRANSACTION');
+      db.execute('BEGIN TRANSACTION');
       started = true;
       final result = await transact();
       db.execute('COMMIT');

diff --git a/packages/wasm_packages/sql_parser/typesql_generator/lib/src/dart_generator.dart b/packages/wasm_packages/sql_parser/typesql_generator/lib/src/dart_generator.dart
@@ -33,6 +33,11 @@ class GenModel {
       tableName: tableName ?? this.tableName,
     );
   }
+
+  @override
+  String toString() {
+    return 'GenModel(useOptional: $useOptional, interfaces: $interfaces, allNullable: $allNullable, tableName: $tableName)';
+  }
 }
 
 void addModelClass(
@@ -225,8 +230,7 @@ String? addModelClassInsert(
   GenModel model = const GenModel(),
 }) {
   final name = '${className}Insert';
-  final didGenerate =
-      t.fields.any((e) => e.defaultValue != null && !e.nullable);
+  final didGenerate = t.fields.any((e) => e.defaultValue != null || e.optional);
   if (didGenerate) {
     addModelClass(
       buf,