--- a/java/sql-dk/src/info/globalcode/sql/dk/DatabaseConnection.java	Sun Dec 22 22:02:44 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/DatabaseConnection.java	Sun Dec 22 23:31:55 2013 +0100
@@ -19,6 +19,7 @@
 
 import info.globalcode.sql.dk.batch.Batch;
 import info.globalcode.sql.dk.configuration.DatabaseDefinition;
+import info.globalcode.sql.dk.formatting.ColumnsHeader;
 import info.globalcode.sql.dk.formatting.Formatter;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -38,7 +39,7 @@
 	public DatabaseConnection(DatabaseDefinition databaseDefinition) throws SQLException {
 		this.databaseDefinition = databaseDefinition;
 
-		connection = DriverManager.getConnection(databaseDefinition.getUrl(), databaseDefinition.getName(), databaseDefinition.getPassword());
+		connection = DriverManager.getConnection(databaseDefinition.getUrl(), databaseDefinition.getUserName(), databaseDefinition.getPassword());
 	}
 
 	public void executeQuery(SQLCommand sqlCommand, Formatter formatter) throws SQLException {
@@ -72,7 +73,7 @@
 	private void processQueryCommand(SQLCommand sqlCommand, Formatter formatter) throws SQLException {
 		formatter.writeStartResultSet();
 		formatter.writeQuery(sqlCommand.getQuery());
-		/** TODO: formatter.writeParameters(null); */
+		formatter.writeParameters(sqlCommand.getParameters());
 		try (PreparedStatement ps = sqlCommand.prepareStatement(connection)) {
 			sqlCommand.parametrize(ps);
 			try (ResultSet rs = ps.executeQuery()) {
@@ -86,7 +87,7 @@
 	private void processUpdateCommand(SQLCommand sqlCommand, Formatter formatter) throws SQLException {
 		formatter.writeStartUpdatesResult();
 		formatter.writeQuery(sqlCommand.getQuery());
-		/** TODO: formatter.writeParameters(null); */
+		formatter.writeParameters(sqlCommand.getParameters());
 		try (PreparedStatement ps = sqlCommand.prepareStatement(connection)) {
 			sqlCommand.parametrize(ps);
 			int updatedRowsCount = ps.executeUpdate();
@@ -104,12 +105,18 @@
 	}
 
 	private void processResultSet(ResultSet rs, Formatter formatter) throws SQLException {
-		/** TODO: formatter.writeColumnsHeader(null); */
+		formatter.writeColumnsHeader(new ColumnsHeader(rs.getMetaData()));
+		int columnCount = rs.getMetaData().getColumnCount();
+
 		while (rs.next()) {
 			formatter.writeStartRow();
 
-			/** TODO: formatter.writeColumnValue(rs.get); */
+			for (int i = 1; i <= columnCount; i++) {
+				formatter.writeColumnValue(rs.getObject(i));
+			}
+
 			formatter.writeEndRow();
 		}
+
 	}
 }