1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/DatabaseConnection.java	Tue Dec 31 18:11:50 2013 +0100
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/DatabaseConnection.java	Wed Jan 01 01:06:38 2014 +0100
     1.3 @@ -19,6 +19,7 @@
     1.4  
     1.5  import info.globalcode.sql.dk.batch.Batch;
     1.6  import info.globalcode.sql.dk.configuration.DatabaseDefinition;
     1.7 +import info.globalcode.sql.dk.configuration.Properties;
     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 @@ -39,11 +40,18 @@
    1.12  	private static final Logger log = Logger.getLogger(DatabaseConnection.class.getName());
    1.13  	private DatabaseDefinition databaseDefinition;
    1.14  	private Connection connection;
    1.15 +	private Properties properties;
    1.16  
    1.17 -	public DatabaseConnection(DatabaseDefinition databaseDefinition) throws SQLException {
    1.18 +	public DatabaseConnection(DatabaseDefinition databaseDefinition, Properties properties) throws SQLException {
    1.19  		this.databaseDefinition = databaseDefinition;
    1.20 +		this.properties = properties;
    1.21  
    1.22 -		connection = DriverManager.getConnection(databaseDefinition.getUrl(), databaseDefinition.getUserName(), databaseDefinition.getPassword());
    1.23 +		properties.setDefaults(databaseDefinition.getProperties());
    1.24 +		java.util.Properties javaProperties = properties.getJavaProperties();
    1.25 +		javaProperties.setProperty("user", databaseDefinition.getUserName());
    1.26 +		javaProperties.setProperty("password", databaseDefinition.getPassword());
    1.27 +
    1.28 +		connection = DriverManager.getConnection(databaseDefinition.getUrl(), javaProperties);
    1.29  	}
    1.30  
    1.31  	public void executeQuery(SQLCommand sqlCommand, Formatter formatter) throws SQLException {