From df112815ff1f820f9f9c7ec2b4c5ca715209edac Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Wed, 27 Jan 2016 21:20:13 +1300 Subject: [PATCH] #545 - ENH: Read environment variable "EBEAN_DB" to set default datasource - typically for CI builds --- .../java/com/avaje/ebean/PrimaryServer.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/avaje/ebean/PrimaryServer.java b/src/main/java/com/avaje/ebean/PrimaryServer.java index 219b7ad6b..a8f99094c 100644 --- a/src/main/java/com/avaje/ebean/PrimaryServer.java +++ b/src/main/java/com/avaje/ebean/PrimaryServer.java @@ -58,15 +58,18 @@ class PrimaryServer { */ private static String determineDefaultServerName() { - String defaultServerName = System.getProperty("datasource.default"); + String defaultServerName = System.getenv("EBEAN_DB"); if (isEmpty(defaultServerName)) { - defaultServerName = System.getProperty("ebean.default.datasource"); - } - if (isEmpty(defaultServerName)) { - defaultServerName = globalProperties.getProperty("datasource.default"); - } - if (isEmpty(defaultServerName)) { - defaultServerName = globalProperties.getProperty("ebean.default.datasource"); + defaultServerName = System.getProperty("datasource.default"); + if (isEmpty(defaultServerName)) { + defaultServerName = System.getProperty("ebean.default.datasource"); + if (isEmpty(defaultServerName)) { + defaultServerName = globalProperties.getProperty("datasource.default"); + if (isEmpty(defaultServerName)) { + defaultServerName = globalProperties.getProperty("ebean.default.datasource"); + } + } + } } return defaultServerName; }