github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-08 16:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #270 from Ryszard-Trojnacki/master

Browse Source 
Ability to run maven tests with diffrent databases.
This commit is contained in:
Rob Bygrave committed 2015-04-12 17:46:22 +12:00
2 parents 2ed5e026e0 c9fb28b288
commit de372bfb89
2 files changed
+14 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/avaje/ebean/PrimaryServer.java
+7 -1
View File
@@ -46,7 +46,13 @@ class PrimaryServer {
if (globalProperties == null) {
globalProperties = PropertyMap.defaultProperties();
}
defaultServerName = globalProperties.getProperty("datasource.default");
defaultServerName = System.getProperty("datasource.default");
if(defaultServerName == null) {
defaultServerName = System.getProperty("ebean.default.datasource");
}
if(defaultServerName == null) {
defaultServerName = globalProperties.getProperty("datasource.default");
}
if (defaultServerName == null) {
defaultServerName = globalProperties.getProperty("ebean.default.datasource");
}