Skip to content

Commit

Permalink
Emit NoticeResponse through the message stream.
Browse files Browse the repository at this point in the history
We now pass-thru NoticeResponse so that notices can be consumed as Result.Message.

[resolves #570]

Signed-off-by: Mark Paluch <mpaluch@vmware.com>
  • Loading branch information
mp911de committed Jul 11, 2023
1 parent 02a9a26 commit 509e5ac
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,7 @@ private boolean consumeMessage(BackendMessage message) {
}

if (message.getClass() == NoticeResponse.class) {

this.settings.getNoticeLogLevel().log(logger, () -> this.context.getMessage(String.format("Notice: %s", toString(((NoticeResponse) message).getFields()))));
return true;
}

if (message.getClass() == BackendKeyData.class) {
Expand Down
46 changes: 46 additions & 0 deletions src/test/java/io/r2dbc/postgresql/SegmentIntegrationTests.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Copyright 2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package io.r2dbc.postgresql;

import io.r2dbc.spi.Result;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;

/**
* Integration tests {@link Result.Segment}.
*/
final class SegmentIntegrationTests extends AbstractIntegrationTests {

@Test
void shouldConsumeNotice() {

this.connection.createStatement("DO language plpgsql $$\n" +
"BEGIN\n" +
" RAISE NOTICE 'hello, world!';\n" +
"END\n" +
"$$;").execute().flatMap(it -> it.flatMap(segment -> {
if (segment instanceof Result.Message) {
return Mono.just(((Result.Message) segment).message());
}
return Mono.empty();
})).as(StepVerifier::create)
.expectNext("hello, world!")
.verifyComplete();
}

}

0 comments on commit 509e5ac

Please sign in to comment.