Skip to content

Commit 718274a

Browse files
authored
Fix regular expression which matches Postgres RETURNING keyword
[resolves #377][#384]
1 parent b8b7f19 commit 718274a

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/main/java/io/r2dbc/postgresql/util/GeneratedValuesUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public final class GeneratedValuesUtils {
2929

3030
private static final Pattern INSERT = Pattern.compile(".*INSERT.*", CASE_INSENSITIVE | Pattern.DOTALL);
3131

32-
private static final Pattern RETURNING = Pattern.compile(".*RETURNING.*", CASE_INSENSITIVE | Pattern.DOTALL);
32+
private static final Pattern RETURNING = Pattern.compile(".*\\bRETURNING\\b.*", CASE_INSENSITIVE | Pattern.DOTALL);
3333

3434
private static final Pattern UPDATE = Pattern.compile(".*UPDATE.*", CASE_INSENSITIVE | Pattern.DOTALL);
3535

src/test/java/io/r2dbc/postgresql/util/GeneratedValuesUtilsUnitTests.java

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ void augmentNoSql() {
5252
void hasReturning() {
5353
assertThat(GeneratedValuesUtils.hasReturningClause("test-sql")).isFalse();
5454
assertThat(GeneratedValuesUtils.hasReturningClause("test-sql RETURNING *")).isTrue();
55+
assertThat(GeneratedValuesUtils.hasReturningClause("select * from userReturning")).isFalse();
56+
assertThat(GeneratedValuesUtils.hasReturningClause("select * from ReturningUser")).isFalse();
5557
}
5658

5759
@Test

0 commit comments

Comments
 (0)