Added new PostgresqlStatement

Also, remove references to SimpleQueryPostgresqlStatement and ExtendedQueryPostgresqlStatement and deleted the files and their tests

[#468]

Author: toverdijk

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

@@ -17,6 +17,7 @@
 package io.r2dbc.postgresql;
 
 import io.r2dbc.postgresql.util.Assert;
+import io.r2dbc.postgresql.util.sql.BasicPostgresqlSqlLexer;
 import io.r2dbc.spi.Batch;
 import reactor.core.publisher.Flux;
 
@@ -40,7 +41,7 @@ final class PostgresqlBatch implements io.r2dbc.postgresql.api.PostgresqlBatch {
     public PostgresqlBatch add(String sql) {
         Assert.requireNonNull(sql, "sql must not be null");
 
-        if (!SimpleQueryPostgresqlStatement.supports(sql)) {
+        if (!(BasicPostgresqlSqlLexer.tokenize(sql).getParameterCount() > 0)) {
             throw new IllegalArgumentException(String.format("Statement '%s' is not supported.  This is often due to the presence of parameters.", sql));
         }
 
@@ -50,7 +51,7 @@ public PostgresqlBatch add(String sql) {
 
     @Override
     public Flux<io.r2dbc.postgresql.api.PostgresqlResult> execute() {
-        return new SimpleQueryPostgresqlStatement(this.context, String.join("; ", this.statements))
+        return new PostgresqlStatement(this.context, String.join("; ", this.statements))
             .execute();
     }
 

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

@@ -86,7 +86,7 @@ final class PostgresqlConnection implements io.r2dbc.postgresql.api.PostgresqlCo
         this.connectionContext = client.getContext();
         this.codecs = Assert.requireNonNull(codecs, "codecs must not be null");
         this.isolationLevel = Assert.requireNonNull(isolationLevel, "isolationLevel must not be null");
-        this.validationQuery = new SimpleQueryPostgresqlStatement(this.resources, "SELECT 1").fetchSize(0).execute().flatMap(PostgresqlResult::getRowsUpdated);
+        this.validationQuery = new io.r2dbc.postgresql.PostgresqlStatement(this.resources, "SELECT 1").fetchSize(0).execute().flatMap(PostgresqlResult::getRowsUpdated);
     }
 
     Client getClient() {
@@ -236,14 +236,7 @@ public Mono<Void> createSavepoint(String name) {
     @Override
     public PostgresqlStatement createStatement(String sql) {
         Assert.requireNonNull(sql, "sql must not be null");
-
-        if (SimpleQueryPostgresqlStatement.supports(sql)) {
-            return new SimpleQueryPostgresqlStatement(this.resources, sql);
-        } else if (ExtendedQueryPostgresqlStatement.supports(sql)) {
-            return new ExtendedQueryPostgresqlStatement(this.resources, sql);
-        } else {
-            throw new IllegalArgumentException(String.format("Statement '%s' cannot be created. This is often due to the presence of both multiple statements and parameters at the same time.", sql));
-        }
+        return new io.r2dbc.postgresql.PostgresqlStatement(this.resources, sql);
     }
 
     /**