1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/DatabaseConnection.java	Wed Jan 01 01:06:38 2014 +0100
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/DatabaseConnection.java	Wed Jan 01 02:44:29 2014 +0100
     1.3 @@ -20,6 +20,7 @@
     1.4  import info.globalcode.sql.dk.batch.Batch;
     1.5  import info.globalcode.sql.dk.configuration.DatabaseDefinition;
     1.6  import info.globalcode.sql.dk.configuration.Properties;
     1.7 +import info.globalcode.sql.dk.configuration.Property;
     1.8  import info.globalcode.sql.dk.formatting.ColumnsHeader;
     1.9  import info.globalcode.sql.dk.formatting.Formatter;
    1.10  import java.sql.Connection;
    1.11 @@ -46,10 +47,12 @@
    1.12  		this.databaseDefinition = databaseDefinition;
    1.13  		this.properties = properties;
    1.14  
    1.15 -		properties.setDefaults(databaseDefinition.getProperties());
    1.16 +		Properties credentials = new Properties();
    1.17 +		credentials.add(new Property("user", databaseDefinition.getUserName()));
    1.18 +		credentials.add(new Property("password", databaseDefinition.getPassword()));
    1.19 +		credentials.setDefaults(databaseDefinition.getProperties());
    1.20 +		properties.setDefaults(credentials);
    1.21  		java.util.Properties javaProperties = properties.getJavaProperties();
    1.22 -		javaProperties.setProperty("user", databaseDefinition.getUserName());
    1.23 -		javaProperties.setProperty("password", databaseDefinition.getPassword());
    1.24  
    1.25  		connection = DriverManager.getConnection(databaseDefinition.getUrl(), javaProperties);
    1.26  	}