From 67bafe53835d541b45ab2dbca80bfcf3bb2033d2 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 28 May 2014 16:02:13 +0200 Subject: [PATCH] [#682] Fixed bad handling of MULTI_SCHEMA connections in tests --- .../src/test/java/org/jooq/test/jOOQAbstractTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java index 5096c2afd4..fdc441f69c 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java +++ b/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java @@ -780,8 +780,11 @@ public abstract class jOOQAbstractTest< jdbcURL = properties.getProperty("db." + d + ".url") + getSchemaSuffix(); jdbcSchema = properties.getProperty("db." + d + ".schema") + getSchemaSuffix(); - jdbcUser = properties.getProperty("db." + d + ".username"); - jdbcPassword = properties.getProperty("db." + d + ".password"); + if (jdbcUser == null) + jdbcUser = properties.getProperty("db." + d + ".username"); + + if (jdbcPassword == null) + jdbcPassword = properties.getProperty("db." + d + ".password"); return getConnection1(jdbcUser, jdbcPassword, properties.getProperty("db." + d + ".driver")); }