Log query in extended flow

Reinstate query logging that got lost due to refactorings.

[resolves #400]

Signed-off-by: Mark Paluch <[email protected]>

Author: mp911de

src/main/java/io/r2dbc/postgresql/ExtendedFlowDelegate.java

@@ -22,6 +22,7 @@
 import io.r2dbc.postgresql.client.Binding;
 import io.r2dbc.postgresql.client.Client;
 import io.r2dbc.postgresql.client.ExtendedQueryMessageFlow;
+import io.r2dbc.postgresql.client.QueryLogger;
 import io.r2dbc.postgresql.client.TransactionStatus;
 import io.r2dbc.postgresql.message.backend.BackendMessage;
 import io.r2dbc.postgresql.message.backend.BindComplete;
@@ -130,7 +131,7 @@ public static Flux<BackendMessage> runQuery(ConnectionResources resources, Excep
             });
         }
 
-        return exchange.doOnDiscard(ReferenceCounted.class, ReferenceCountUtil::release).filter(RESULT_FRAME_FILTER).handle(factory::handleErrorResponse);
+        return exchange.doOnSubscribe(it -> QueryLogger.logQuery(client.getContext(), query)).doOnDiscard(ReferenceCounted.class, ReferenceCountUtil::release).filter(RESULT_FRAME_FILTER).handle(factory::handleErrorResponse);
     }
 
     /**

src/main/java/io/r2dbc/postgresql/client/QueryLogger.java

@@ -22,11 +22,11 @@
 /**
  * Query logger to log queries.
  */
-final class QueryLogger {
+public final class QueryLogger {
 
     private static final Logger QUERY_LOGGER = Loggers.getLogger("io.r2dbc.postgresql.QUERY");
 
-    static void logQuery(ConnectionContext context, String query) {
+    public static void logQuery(ConnectionContext context, String query) {
         QUERY_LOGGER.debug(context.getMessage("Executing query: {}"), query);
     }