From 4094339407659c75be5c868a361b622df2b4d6db Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Wed, 8 Apr 2020 14:13:57 +1200 Subject: [PATCH] #1984 - ENH: Add DB.script() ... to access ScriptRunner from DB --- src/main/java/io/ebean/DB.java | 16 ++++++++++++++++ src/test/java/io/ebean/EbeanServer_refresh.java | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/ebean/DB.java b/src/main/java/io/ebean/DB.java index 14246edea..a2476aa07 100644 --- a/src/main/java/io/ebean/DB.java +++ b/src/main/java/io/ebean/DB.java @@ -101,6 +101,22 @@ public class DB { // return originalPrimaryServer; // } + /** + * Return the ScriptRunner for the default database. + *

+ * Useful to run SQL scripts that are resources. For example a test script + * for inserting seed data for a particular test. + * + *

{@code
+   *
+   *   DB.script().run("/scripts/test-script.sql")
+   *
+   * }
+ */ + public static ScriptRunner script() { + return getDefault().script(); + } + /** * Return the ExpressionFactory from the default database. *

diff --git a/src/test/java/io/ebean/EbeanServer_refresh.java b/src/test/java/io/ebean/EbeanServer_refresh.java index f9243082d..1e1900a13 100644 --- a/src/test/java/io/ebean/EbeanServer_refresh.java +++ b/src/test/java/io/ebean/EbeanServer_refresh.java @@ -22,8 +22,8 @@ public class EbeanServer_refresh { map.put("tableName", "e_basic"); EbeanServer server = Ebean.getDefaultServer(); - server.script().run("/scripts/test-script.sql"); - server.script().run("/scripts/test-script-2.sql", map); + DB.script().run("/scripts/test-script.sql"); + DB.script().run("/scripts/test-script-2.sql", map); server.script().run(this.getClass().getResource("/scripts/test-script.sql")); server.script().run(this.getClass().getResource("/scripts/test-script-2.sql"), map);