Ignore trailing semicolon in extended statement check.

We now no longer reject statements with a single trailing semicolon.

[resolves pgjdbc#439]

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

Author: mp911de

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

@@ -157,7 +157,9 @@ public String toString() {
     static boolean supports(String sql) {
         Assert.requireNonNull(sql, "sql must not be null");
 
-        return !sql.trim().isEmpty() && !sql.contains(";") && sql.contains("$1");
+        int semicolon = sql.indexOf(';');
+
+        return !sql.trim().isEmpty() && (semicolon == -1 || sql.trim().length() - 1 == semicolon) && sql.contains("$1");
     }
 
     Binding getCurrentBinding() {

src/test/java/io/r2dbc/postgresql/ExtendedQueryPostgresqlStatementUnitTests.java

@@ -408,6 +408,10 @@ void supportsQueryEmpty() {
     @Test
     void supportsSemicolon() {
         assertThat(ExtendedQueryPostgresqlStatement.supports("test-query-1; test-query-2")).isFalse();
+        assertThat(ExtendedQueryPostgresqlStatement.supports("test-query-1; test-query-2;")).isFalse();
+        assertThat(ExtendedQueryPostgresqlStatement.supports("test-query-1; test-query-2 with $1;")).isFalse();
+        assertThat(ExtendedQueryPostgresqlStatement.supports("test-query-1 with $1; ")).isTrue();
+        assertThat(ExtendedQueryPostgresqlStatement.supports("test-query-1 with $1;")).isTrue();
     }
 
     @Test