1 files changed, 18 insertions, 18 deletions

diff --git a/src/com.example.portfolio2/com/example/portfolio2/Database.java b/src/com.example.portfolio2/com/example/portfolio2/Database.java
index 22a7c5a..e03b913 100644
--- a/src/com.example.portfolio2/com/example/portfolio2/Database.java
+++ b/src/com.example.portfolio2/com/example/portfolio2/Database.java
@@ -35,8 +35,8 @@ class Database {
 			return -1;
 		}
 		ArrayList<String> result = db.query(
-			"select indeks from activity"
-			+ " where name is '" + name + "';",
+			"SELECT indeks FROM activity"
+			+ " WHERE name IS '" + name + "';",
 			"indeks");
 
 		return Integer.parseInt(result.getFirst());
@@ -46,7 +46,7 @@ class Database {
 	///
 	/// @param activityIndex  index of activity
 	void addParticipation(final int activityIndex) {
-		db.cmd("insert into participation values(123, "
+		db.cmd("INSERT INTO participation VALUES(123, "
 			+ activityIndex + ");");
 	}
 
@@ -56,15 +56,15 @@ class Database {
 	/// @return         names of participating activities
 	ArrayList<String> getParticipation(final String program) {
 		return db.query(
-			"select name from participation p"
-			+ " inner join activity a on p.indeks = a.indeks"
-			+ " where program is '" + program + "';",
+			"SELECT name FROM participation p"
+			+ " INNER JOIN activity a ON p.indeks = a.indeks"
+			+ " WHERE program IS '" + program + "';",
 			"name");
 	}
 
 	/// purge participation database
 	void clearParticipation() {
-		db.cmd("delete from participation");
+		db.cmd("DELETE FROM participation");
 	}
 
 	/// list activities within a program
@@ -73,8 +73,8 @@ class Database {
 	/// @return         names of contained activities
 	ArrayList<String> selectProgram(final String program) {
 		return db.query(
-			"select name from activity"
-			+ " where program is '" + program + "';",
+			"SELECT name FROM activity"
+			+ " WHERE program IS '" + program + "';",
 			"name");
 	}
 
@@ -87,14 +87,14 @@ class Database {
 			return "0";
 		}
 		ArrayList<String> result = db.query(
-			"select sum(activity.ects)"
-			+ " as total_ects,student.name"
-			+ " from student left outer join participation"
-			+ " on student.studid = participation.studid"
-			+ " inner join activity"
-			+ " on participation.indeks = activity.indeks"
-			+ " where program is '" + program + "'"
-			+ " group by student.studid ;",
+			"SELECT SUM(activity.ects)"
+			+ " AS total_ects,student.name"
+			+ " FROM student LEFT OUTER JOIN participation"
+			+ " ON student.studid = participation.studid"
+			+ " INNER JOIN activity"
+			+ " ON participation.indeks = activity.indeks"
+			+ " WHERE program IS '" + program + "'"
+			+ " GROUP BY student.studid ;",
 			"total_ects");
 		if (result.isEmpty()) {
 			return "0";
@@ -119,6 +119,6 @@ class Database {
 	///
 	/// @return  names of all activities as list of strings
 	ArrayList<String> getAllActivities() {
-		return db.query("select name from activity;", "name");
+		return db.query("SELECT name FROM activity;", "name");
 	}
 }