equal
deleted
inserted
replaced
18 package info.globalcode.sql.dk; |
18 package info.globalcode.sql.dk; |
19 |
19 |
20 import info.globalcode.sql.dk.batch.Batch; |
20 import info.globalcode.sql.dk.batch.Batch; |
21 import info.globalcode.sql.dk.configuration.DatabaseDefinition; |
21 import info.globalcode.sql.dk.configuration.DatabaseDefinition; |
22 import info.globalcode.sql.dk.configuration.Properties; |
22 import info.globalcode.sql.dk.configuration.Properties; |
|
23 import info.globalcode.sql.dk.configuration.Property; |
23 import info.globalcode.sql.dk.formatting.ColumnsHeader; |
24 import info.globalcode.sql.dk.formatting.ColumnsHeader; |
24 import info.globalcode.sql.dk.formatting.Formatter; |
25 import info.globalcode.sql.dk.formatting.Formatter; |
25 import java.sql.Connection; |
26 import java.sql.Connection; |
26 import java.sql.DriverManager; |
27 import java.sql.DriverManager; |
27 import java.sql.PreparedStatement; |
28 import java.sql.PreparedStatement; |
44 |
45 |
45 public DatabaseConnection(DatabaseDefinition databaseDefinition, Properties properties) throws SQLException { |
46 public DatabaseConnection(DatabaseDefinition databaseDefinition, Properties properties) throws SQLException { |
46 this.databaseDefinition = databaseDefinition; |
47 this.databaseDefinition = databaseDefinition; |
47 this.properties = properties; |
48 this.properties = properties; |
48 |
49 |
49 properties.setDefaults(databaseDefinition.getProperties()); |
50 Properties credentials = new Properties(); |
|
51 credentials.add(new Property("user", databaseDefinition.getUserName())); |
|
52 credentials.add(new Property("password", databaseDefinition.getPassword())); |
|
53 credentials.setDefaults(databaseDefinition.getProperties()); |
|
54 properties.setDefaults(credentials); |
50 java.util.Properties javaProperties = properties.getJavaProperties(); |
55 java.util.Properties javaProperties = properties.getJavaProperties(); |
51 javaProperties.setProperty("user", databaseDefinition.getUserName()); |
|
52 javaProperties.setProperty("password", databaseDefinition.getPassword()); |
|
53 |
56 |
54 connection = DriverManager.getConnection(databaseDefinition.getUrl(), javaProperties); |
57 connection = DriverManager.getConnection(databaseDefinition.getUrl(), javaProperties); |
55 } |
58 } |
56 |
59 |
57 public void executeQuery(SQLCommand sqlCommand, Formatter formatter) throws SQLException { |
60 public void executeQuery(SQLCommand sqlCommand, Formatter formatter) throws SQLException { |