From 76356308085688e221c3b5ada01f2064ba6d4aff Mon Sep 17 00:00:00 2001
From: "robin.bygrave" <robin.bygrave@eroad.com>
Date: Fri, 26 May 2023 15:03:13 +1200
Subject: [PATCH] Use Statement for truncate table and postgres version query

---
 .../java/io/ebeaninternal/server/core/DefaultServer.java    | 6 +++---
 .../src/test/java/io/ebean/xtest/base/DtoQuery3Test.java    | 2 +-
 .../ebean/platform/postgres/PostgresPlatformProvider.java   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 79ef10b8e..4ada7de70 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -51,8 +51,8 @@ import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.time.Clock;
 import java.util.*;
 import java.util.concurrent.Callable;
@@ -560,9 +560,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   private void executeSql(Connection connection, @Nullable String sql) throws SQLException {
     if (sql != null) {
-      try (PreparedStatement stmt = connection.prepareStatement(sql)) {
+      try (Statement stmt = connection.createStatement()) {
         transactionManager.log().sql().debug(sql);
-        stmt.execute();
+        stmt.execute(sql);
       }
     }
   }
diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery3Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery3Test.java
index a717e0052..5f0c1f0af 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery3Test.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery3Test.java
@@ -14,7 +14,7 @@ class DtoQuery3Test extends BaseTestCase {
   void dtoQuery_when_constructorsClash() {
     ResetBasicData.reset();
 
-    List<DCust> list = server().findDto(DCust.class, "select id, name, status from o_customer").findList();
+    List<DCust> list = server().findDto(DCust.class, "select id, name, status from o_customer where status is not null").findList();
 
     assertThat(list).isNotEmpty();
     for (DCust cust: list) {
diff --git a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java
index 96d0b223f..6f8bc9f09 100644
--- a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java
+++ b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java
@@ -52,10 +52,10 @@ public class PostgresPlatformProvider implements DatabasePlatformProvider {
       if (productVersion.contains("-yb-")) {
         return new YugabytePlatform();
       }
-      try (PreparedStatement statement = connection.prepareStatement("select version() as \"version\"")) {
-        try (ResultSet resultSet = statement.executeQuery()) {
+      try (Statement statement = connection.createStatement()) {
+        try (ResultSet resultSet = statement.executeQuery("select version()")) {
           if (resultSet.next()) {
-            productVersion = resultSet.getString("version").toLowerCase();
+            productVersion = resultSet.getString(1).toLowerCase();
             if (productVersion.contains("cockroach")) {
               return new CockroachPlatform();
             }