From f787483e30e2b67cf4e6808e0b5eb32e79ca504a Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Mon, 4 Feb 2019 11:54:45 +1300 Subject: [PATCH] #1629 - ENH: Add sqlQuery(sql) and sqlUpdate(sql) ... as alias for createSqlQuery(sql) and createSqlUpdate(sql) --- .../ebeaninternal/server/core/DefaultServer.java | 14 ++++++++++++-- .../io/ebeaninternal/api/TDSpiEbeanServer.java | 12 +++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 77f0e7d0d..db6e1bf0a 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -1083,15 +1083,25 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public SqlQuery createSqlQuery(String sql) { + public SqlQuery sqlQuery(String sql) { return new DefaultRelationalQuery(this, sql.trim()); } @Override - public SqlUpdate createSqlUpdate(String sql) { + public SqlQuery createSqlQuery(String sql) { + return sqlQuery(sql); + } + + @Override + public SqlUpdate sqlUpdate(String sql) { return new DefaultSqlUpdate(this, sql.trim()); } + @Override + public SqlUpdate createSqlUpdate(String sql) { + return sqlUpdate(sql); + } + @Override public CallableSql createCallableSql(String sql) { return new DefaultCallableSql(this, sql.trim()); diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 2a7026e04..44bad8903 100644 --- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -507,14 +507,24 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } + @Override + public SqlQuery sqlQuery(String sql) { + return null; + } + @Override public SqlQuery createSqlQuery(String sql) { + return sqlQuery(sql); + } + + @Override + public SqlUpdate sqlUpdate(String sql) { return null; } @Override public SqlUpdate createSqlUpdate(String sql) { - return null; + return sqlUpdate(sql); } @Override