From a4ff96a83145cedc03b180074cb15a2b1e9127b9 Mon Sep 17 00:00:00 2001
From: "thomashii@dukefirehawk.com" <thomashii@dukefirehawk.com>
Date: Mon, 3 May 2021 22:05:25 +0800
Subject: [PATCH] Updated pubspec.yaml

---
 packages/orm/angel_orm/pubspec.yaml                       | 2 +-
 .../orm/angel_orm_postgres/lib/angel_orm_postgres.dart    | 8 +++++---
 packages/orm/angel_orm_postgres/pubspec.yaml              | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/orm/angel_orm/pubspec.yaml b/packages/orm/angel_orm/pubspec.yaml
index 94a6b91a..983320cf 100644
--- a/packages/orm/angel_orm/pubspec.yaml
+++ b/packages/orm/angel_orm/pubspec.yaml
@@ -9,6 +9,7 @@ dependencies:
   intl: ^0.17.0
   meta: ^1.3.0
   string_scanner: ^1.1.0
+  optional: ^6.0.0-nullsafety.2
 dev_dependencies:
   angel_model:
     git: 
@@ -28,4 +29,3 @@ dev_dependencies:
   build_runner: ^2.0.1
   pedantic: ^1.11.0
   test: ^1.17.3
-  optional: ^6.0.0-nullsafety.2
diff --git a/packages/orm/angel_orm_postgres/lib/angel_orm_postgres.dart b/packages/orm/angel_orm_postgres/lib/angel_orm_postgres.dart
index faa1900f..e80edbc8 100644
--- a/packages/orm/angel_orm_postgres/lib/angel_orm_postgres.dart
+++ b/packages/orm/angel_orm_postgres/lib/angel_orm_postgres.dart
@@ -41,7 +41,7 @@ class PostgreSqlExecutor extends QueryExecutor {
   }
 
   @override
-  Future<T?> transaction<T>(FutureOr<T> Function(QueryExecutor) f) async {
+  Future<T> transaction<T>(FutureOr<T> Function(QueryExecutor) f) async {
     if (_connection is! PostgreSQLConnection) {
       return await f(this);
     }
@@ -54,6 +54,8 @@ class PostgreSqlExecutor extends QueryExecutor {
         logger?.fine('Entering transaction');
         var tx = PostgreSqlExecutor(ctx, logger: logger);
         returnValue = await f(tx);
+
+        return returnValue;
       } catch (e) {
         ctx.cancelTransaction(reason: e.toString());
         rethrow;
@@ -70,7 +72,7 @@ class PostgreSqlExecutor extends QueryExecutor {
           'The transaction was cancelled with reason "${txResult.reason}".');
       //}
     } else {
-      return returnValue;
+      return returnValue!;
     }
   }
 }
@@ -136,7 +138,7 @@ class PostgreSqlExecutorPool extends QueryExecutor {
   }
 
   @override
-  Future<T?> transaction<T>(FutureOr<T> Function(QueryExecutor) f) {
+  Future<T> transaction<T>(FutureOr<T> Function(QueryExecutor) f) {
     return _pool.withResource(() async {
       var executor = await _next();
       return executor.transaction(f);
diff --git a/packages/orm/angel_orm_postgres/pubspec.yaml b/packages/orm/angel_orm_postgres/pubspec.yaml
index 6d8942d8..4e097541 100644
--- a/packages/orm/angel_orm_postgres/pubspec.yaml
+++ b/packages/orm/angel_orm_postgres/pubspec.yaml
@@ -14,6 +14,7 @@ dependencies:
   logging: ^1.0.1
   pool: ^1.5.0
   postgres: ^2.3.2
+  #optional: ^6.0.0-nullsafety.2
 
 dev_dependencies:
   angel_orm_test:
@@ -27,6 +28,7 @@ dev_dependencies:
       ref: sdk-2.12.x_nnbd
       path: packages/pretty_logging
   test: ^1.17.3
+
 #dependency_overrides:
 #  angel_orm_test:
 #    path: ../angel_orm_test