nullable sub values

Author: j4qfrost

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.containsKey(identifier.name)) {
+        if (values != null && !values.containsKey(identifier.name)) {
           // Format string specified identifier with name ${identifier.name},
           // but key was not present in values.
           return t.buffer;