revert and change incrementally

Author: j4qfrost

lib/src/connection.dart

@@ -215,7 +215,7 @@ class PostgreSQLConnection extends Object
   /// default query timeout will be used.
   Future transaction(
     Future Function(PostgreSQLExecutionContext connection) queryBlock, {
-    int? commitTimeoutInSeconds,
+    int commitTimeoutInSeconds = 30,
   }) async {
     if (isClosed) {
       throw PostgreSQLException(
@@ -418,7 +418,7 @@ abstract class _PostgreSQLExecutionContextMixin
   @override
   Future<PostgreSQLResult?> query(
     String fmtString, {
-    Map<String, dynamic>? substitutionValues,
+    Map<String, dynamic> substitutionValues = const {},
     bool allowReuse = true,
     int timeoutInSeconds = 30,
   }) =>
@@ -431,7 +431,7 @@ abstract class _PostgreSQLExecutionContextMixin
 
   Future<PostgreSQLResult?> _query(
     String fmtString, {
-    Map<String, dynamic>? substitutionValues,
+    Map<String, dynamic> substitutionValues = const {},
     required bool allowReuse,
     int? timeoutInSeconds,
     bool resolveOids = true,
@@ -489,7 +489,8 @@ abstract class _PostgreSQLExecutionContextMixin
 
   @override
   Future<int?> execute(String fmtString,
-      {Map<String, dynamic>? substitutionValues, int? timeoutInSeconds}) async {
+      {Map<String, dynamic> substitutionValues = const {},
+      int? timeoutInSeconds}) async {
     timeoutInSeconds ??= _connection.queryTimeoutInSeconds;
     if (_connection.isClosed) {
       throw PostgreSQLException(

lib/src/connection_fsm.dart

@@ -255,13 +255,12 @@ class _PostgreSQLConnectionStateBusy extends _PostgreSQLConnectionState {
     // print("(${query.statement}) -> $message");
 
     if (message is ReadyForQueryMessage) {
-      if (message.state == ReadyForQueryMessage.StateTransactionError) {
-        query.completeError(returningException!);
-        return _PostgreSQLConnectionStateReadyInTransaction(
-            query.transaction as _TransactionProxy);
-      }
-
       if (returningException != null) {
+        if (message.state == ReadyForQueryMessage.StateTransactionError) {
+          query.completeError(returningException!);
+          return _PostgreSQLConnectionStateReadyInTransaction(
+              query.transaction as _TransactionProxy);
+        }
         query.completeError(returningException!);
       } else {
         query.complete(rowsAffected);

lib/src/query.dart

@@ -29,7 +29,7 @@ class Query<T> {
   Future<QueryResult<T>?> get future => _onComplete.future;
 
   final String statement;
-  final Map<String, dynamic>? substitutionValues;
+  final Map<String, dynamic> substitutionValues;
   final PostgreSQLExecutionContext transaction;
   final PostgreSQLConnection connection;
 
@@ -96,7 +96,7 @@ class Query<T> {
   }
 
   void sendCachedQuery(Socket socket, CachedQuery cacheQuery,
-      Map<String, dynamic>? substitutionValues) {
+      Map<String, dynamic> substitutionValues) {
     final statementName = cacheQuery.preparedStatementName;
     final parameterList = cacheQuery.orderedParameters!
         .map((identifier) => ParameterValue(identifier, substitutionValues))
@@ -196,13 +196,13 @@ class CachedQuery {
 
 class ParameterValue {
   factory ParameterValue(PostgreSQLFormatIdentifier identifier,
-      Map<String, dynamic>? substitutionValues) {
+      Map<String, dynamic> substitutionValues) {
     if (identifier.type == null) {
-      return ParameterValue.text(substitutionValues?[identifier.name]);
+      return ParameterValue.text(substitutionValues[identifier.name]);
     }
 
     return ParameterValue.binary(
-        substitutionValues?[identifier.name], identifier.type!);
+        substitutionValues[identifier.name], identifier.type!);
   }
 
   factory ParameterValue.binary(

lib/src/substituter.dart

@@ -52,10 +52,10 @@ class PostgreSQLFormat {
     }
   }
 
-  static String substitute(String fmtString, Map<String, dynamic>? values,
+  static String substitute(String fmtString, Map<String, dynamic> values,
       {SQLReplaceIdentifierFunction? replace}) {
     final converter = PostgresTextEncoder();
-    replace ??= (spec, index) => converter.convert(values?[spec.name]);
+    replace ??= (spec, index) => converter.convert(values[spec.name]);
 
     final items = <PostgreSQLFormatToken>[];
     PostgreSQLFormatToken? currentPtr;
@@ -114,7 +114,7 @@ class PostgreSQLFormat {
       } else {
         final identifier = PostgreSQLFormatIdentifier(t.buffer.toString());
 
-        if (values != null && !values.containsKey(identifier.name)) {
+        if (!values.containsKey(identifier.name)) {
           // Format string specified identifier with name ${identifier.name},
           // but key was not present in values.
           return t.buffer;