fix cast bugs

hpoul · hpoul · commit e44a0c9f92cb · 2021-08-02T00:41:39.000+02:00
diff --git a/lib/src/database_access.dart b/lib/src/database_access.dart
@@ -124,7 +124,7 @@ class DatabaseTransactionBase<TABLES extends TablesBase> {
   }
 
   Future<PostgreSQLResult> query(String fmtString,
-      {Map<String, Object>? values,
+      {Map<String, Object?>? values,
       bool allowReuse = true,
       int? timeoutInSeconds}) async {
     assert(_assertCorrectValues(values));
diff --git a/lib/src/tables/base_tables.dart b/lib/src/tables/base_tables.dart
@@ -22,8 +22,9 @@ abstract class TableConstants {
 }
 
 extension FuturePostgreSQL on Future<PostgreSQLResult> {
-  Future<T?> singleOrNull<T>(FutureOr<T> Function(PostgreSQLResultRow row) cb) =>
-      then((value) => value.singleOrNull(cb as T Function(PostgreSQLResultRow)));
+  Future<T?> singleOrNull<T>(
+          FutureOr<T?> Function(PostgreSQLResultRow row) cb) =>
+      then((value) => value.singleOrNull<FutureOr<T?>>(cb));
   Future<PostgreSQLResultRow> get single => then((value) => value.single);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ class DatabaseTransactionBase<TABLES extends TablesBase> {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`Future<PostgreSQLResult> query(String fmtString,`
`127`		`- {Map<String, Object>? values,`
	`127`	`+ {Map<String, Object?>? values,`
`128`	`128`	`bool allowReuse = true,`
`129`	`129`	`int? timeoutInSeconds}) async {`
`130`	`130`	`assert(_assertCorrectValues(values));`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,9 @@ abstract class TableConstants {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`extension FuturePostgreSQL on Future<PostgreSQLResult> {`
`25`		`- Future<T?> singleOrNull<T>(FutureOr<T> Function(PostgreSQLResultRow row) cb) =>`
`26`		`- then((value) => value.singleOrNull(cb as T Function(PostgreSQLResultRow)));`
	`25`	`+ Future<T?> singleOrNull<T>(`
	`26`	`+ FutureOr<T?> Function(PostgreSQLResultRow row) cb) =>`
	`27`	`+ then((value) => value.singleOrNull<FutureOr<T?>>(cb));`
`27`	`28`	`Future<PostgreSQLResultRow> get single => then((value) => value.single);`
`28`	`29`	`}`
`29`	`30`