Do not send auto savepoint in simpleQuery mode fixes Issue 3107

docs/content/documentation/server-prepare.md

@@ -402,7 +402,7 @@ following might be helpful to debug the case.
 
 1. Client logging. If you add `loggerLevel=TRACE&loggerFile=pgjdbc-trace.log`, you would get trace
 of the messages send between the driver and the backend
-1. You might check `org.postgresql.test.jdbc2.AutoRollbackTestSuite` as it verifies lots of combinations
+1. You might check `org.postgresql.test.jdbc2.AutoRollbackTest` as it verifies lots of combinations
 
 ##### Example 9.3. Using server side prepared statements
 
@@ -974,4 +974,4 @@ try (Connection con = DriverManager.getConnection(url, "postgres", "somepassword
 }
 ```
 
-More examples can be found in the [Copy Test Code](https://github.com/pgjdbc/pgjdbc/blob/master/pgjdbc/src/test/java/org/postgresql/test/jdbc2/CopyTest.java)
+More examples can be found in the [Copy Test Code](https://github.com/pgjdbc/pgjdbc/blob/master/pgjdbc/src/test/java/org/postgresql/test/jdbc2/CopyTest.java)

pgjdbc/src/main/java/org/postgresql/core/v3/QueryExecutorImpl.java

@@ -429,10 +429,7 @@ && getAutoSave() != AutoSave.NEVER
       SAVEPOINTS.
        */
       sendOneQuery(autoSaveQuery, SimpleQuery.NO_PARAMETERS, 1, 0,
-          QUERY_NO_RESULTS | QUERY_NO_METADATA
-              // PostgreSQL does not support bind, exec, simple, sync message flow,
-              // so we force autosavepoint to use simple if the main query is using simple
-              | QUERY_EXECUTE_AS_SIMPLE);
+          QUERY_NO_RESULTS | QUERY_NO_METADATA);
       return true;
     }
     return false;
@@ -444,8 +441,7 @@ && getAutoSave() == AutoSave.ALWAYS
         && getTransactionState() == TransactionState.OPEN) {
       try {
         sendOneQuery(releaseAutoSave, SimpleQuery.NO_PARAMETERS, 1, 0,
-            QUERY_NO_RESULTS | QUERY_NO_METADATA
-                | QUERY_EXECUTE_AS_SIMPLE);
+            QUERY_NO_RESULTS | QUERY_NO_METADATA);
 
       } catch (IOException ex) {
         throw  new PSQLException(GT.tr("Error releasing savepoint"), PSQLState.IO_ERROR);

pgjdbc/src/test/java/org/postgresql/test/jdbc2/AutoRollbackTestSuite.java → pgjdbc/src/test/java/org/postgresql/test/jdbc2/AutoRollbackTest.java

@@ -34,7 +34,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 @RunWith(Parameterized.class)
-public class AutoRollbackTestSuite extends BaseTest4 {
+public class AutoRollbackTest extends BaseTest4 {
   private static final AtomicInteger counter = new AtomicInteger();
 
   private enum CleanSavePoint {
@@ -125,7 +125,7 @@ private enum ContinueMode {
   private final TestStatement testSql;
   private final ReturnColumns cols;
 
-  public AutoRollbackTestSuite(AutoSave autoSave, CleanSavePoint cleanSavePoint, AutoCommit autoCommit,
+  public AutoRollbackTest(AutoSave autoSave, CleanSavePoint cleanSavePoint, AutoCommit autoCommit,
       FailMode failMode, ContinueMode continueMode, boolean flushCacheOnDeallocate,
       boolean trans, TestStatement testSql, ReturnColumns cols) {
     this.autoSave = autoSave;