diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java index 8f5e4b41c..43396fab9 100644 --- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java @@ -140,8 +140,6 @@ public class DatabasePlatform { protected Platform platform = Platform.GENERIC; protected String truncateTable = "truncate table %s"; - protected String truncateTableBefore; - protected String truncateTableAfter; protected String columnAliasPrefix = "c"; @@ -719,20 +717,6 @@ public class DatabasePlatform { return String.format(truncateTable, table); } - /** - * Return a statement to execute prior to truncate (like disable foreign keys for mysql). - */ - public String truncateStatementBefore() { - return truncateTableBefore; - } - - /** - * Return a statement to execute after truncate (like enable foreign keys for mysql). - */ - public String truncateStatementAfter() { - return truncateTableAfter; - } - /** * Create the DB schema if it does not exist. */ diff --git a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java index c914559eb..b7a3b1660 100644 --- a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java +++ b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java @@ -26,8 +26,6 @@ public class H2Platform extends DatabasePlatform { this.supportsDeleteTableAlias = true; this.dbDefaultValue.setNow("now()"); this.columnAliasPrefix = null; - //this.truncateTableBefore = "set referential_integrity false"; - //this.truncateTableAfter = "set referential_integrity true"; this.exceptionTranslator = new SqlErrorCodes() .addAcquireLock("50200","HYT00") diff --git a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java index 977ea97f0..83d509da4 100644 --- a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java @@ -31,8 +31,6 @@ public class MySqlPlatform extends DatabasePlatform { this.dbEncrypt = new MySqlDbEncrypt(); this.historySupport = new MySqlHistorySupport(); this.columnAliasPrefix = null; - //this.truncateTableBefore = "set foreign_key_checks = 0"; - //this.truncateTableAfter = "set foreign_key_checks = 1"; this.dbIdentity.setIdType(IdType.IDENTITY); this.dbIdentity.setSupportsGetGeneratedKeys(true); this.dbIdentity.setSupportsIdentity(true); diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 9818052c3..708a379d7 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -653,11 +653,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override public void truncate(String... tables) { try (Connection connection = getDataSource().getConnection()) { - executeSql(connection, databasePlatform.truncateStatementBefore()); for (String table : tables) { executeSql(connection, databasePlatform.truncateStatement(table)); } - executeSql(connection, databasePlatform.truncateStatementAfter()); connection.commit(); } catch(SQLException e) { throw new PersistenceException("Error executing truncate", e); diff --git a/src/test/java/main/StartCockroach.java b/src/test/java/main/StartCockroach.java index 5aa4a87a5..dfdd96a40 100644 --- a/src/test/java/main/StartCockroach.java +++ b/src/test/java/main/StartCockroach.java @@ -1,16 +1,16 @@ package main; -import io.ebean.docker.commands.CockroachConfig; -import io.ebean.docker.commands.CockroachContainer; +//import io.ebean.docker.commands.CockroachConfig; +//import io.ebean.docker.commands.CockroachContainer; public class StartCockroach { public static void main(String[] args) { - CockroachConfig config = new CockroachConfig(); - config.setDbName("unit"); - - CockroachContainer container = new CockroachContainer(config); - container.startWithDropCreate(); +// CockroachConfig config = new CockroachConfig(); +// config.setDbName("unit"); +// +// CockroachContainer container = new CockroachContainer(config); +// container.startWithDropCreate(); } }