Fix 2.4

ioannidis · May 10, 2018 · 6f6e7b0 · 6f6e7b0
1 parent 9315e43
commit 6f6e7b0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/2.4_FINAL.sql b/2.4_FINAL.sql
@@ -1,2 +1,2 @@
-SELECT id FROM service_history
+SELECT * FROM service_history
 WHERE end_date IS NULL
diff --git a/JDBC_Example/.idea/workspace.xml b/JDBC_Example/.idea/workspace.xml
diff --git a/JDBC_Example/out/production/JDBC_Example/com/papei/database/Main.class b/JDBC_Example/out/production/JDBC_Example/com/papei/database/Main.class
diff --git a/JDBC_Example/src/com/papei/database/Main.java b/JDBC_Example/src/com/papei/database/Main.java
@@ -232,20 +232,25 @@ private static void executeD()
 		System.out.println("Erotima D");
 
 		Statement statement;
-		String query = "SELECT id FROM service_history WHERE end_date IS NULL";
+		String query = "SELECT * FROM service_history WHERE end_date IS NULL";
 
 		try
 		{
 			statement = conn.createStatement();
 			ResultSet res = statement.executeQuery(query);
 
-			System.out.format("%-5s", "ID");
+			System.out.format("%-5s%-10s%-10s%-10s%-20s%-20s", "ID", "Car ID", "Tech ID", "Cost", "Start Date", "End Date");
 
 			while (res.next())
 			{
 				System.out.format(
-						"%n%-5d",
-						res.getInt("id"));
+						"%n%-5d%-10d%-10d%-10d%-20s%-20s",
+						res.getInt("id"),
+						res.getInt("car_id"),
+						res.getInt("tech_id"),
+						res.getInt("cost"),
+						res.getString("start_date"),
+						res.getString("end_date"));
 			}
 		}
 		catch (SQLException e)