diff --git a/backend/database.mv.db b/backend/database.mv.db index 8abdd0d..1b555f7 100644 Binary files a/backend/database.mv.db and b/backend/database.mv.db differ diff --git a/backend/database.trace.db b/backend/database.trace.db index 9ea9c23..71f72fe 100644 --- a/backend/database.trace.db +++ b/backend/database.trace.db @@ -219,3 +219,7 @@ Caused by: org.h2.mvstore.MVStoreException: The file is locked: D:/DH/TIF22A_Anw at org.h2.mvstore.FileStore.open(FileStore.java:128) at org.h2.mvstore.MVStore.(MVStore.java:452) ... 37 more +2023-05-08 13:00:29 jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Syntax Fehler in SQL Befehl "create table semester (id int auto_increment, startweeknumber int, endweeknumber int, name varchar(30), [*]year int)"; erwartet "identifier" +Syntax error in SQL statement "create table semester (id int auto_increment, startweeknumber int, endweeknumber int, name varchar(30), [*]year int)"; expected "identifier"; SQL statement: +create table semester (id int auto_increment, startweeknumber int, endweeknumber int, name varchar(30), year int) [42001-214] diff --git a/backend/src/main/java/com/example/backend/anwprj/DataBaseHandler.java b/backend/src/main/java/com/example/backend/anwprj/DataBaseHandler.java index 1d3cd20..d521b5a 100644 --- a/backend/src/main/java/com/example/backend/anwprj/DataBaseHandler.java +++ b/backend/src/main/java/com/example/backend/anwprj/DataBaseHandler.java @@ -45,7 +45,9 @@ public class DataBaseHandler rs.getInt("id"), rs.getInt("startweeknumber"), rs.getInt("endweeknumber"), - rs.getString("name") + rs.getString("name"), + rs.getInt("startyear"), + rs.getInt("endyear") ); } } @@ -61,7 +63,7 @@ public class DataBaseHandler { try { - st.executeUpdate("insert into SEMESTER (startweeknumber, endweeknumber, name) values (" + s.getStartweeknumber() + ", " + s.getEndweeknumber() + ", '" + s.getName() + "')"); + st.executeUpdate("insert into SEMESTER (startweeknumber, endweeknumber, name, startyear, endyear) values (" + s.getStartweeknumber() + ", " + s.getEndweeknumber() + ", '" + s.getName() + "', " + s.getStartYear() + ", " + s.getEndYear() + ")"); return true; } catch (SQLException e) diff --git a/backend/src/main/java/com/example/backend/anwprj/Semesters/Semester.java b/backend/src/main/java/com/example/backend/anwprj/Semesters/Semester.java index 91cd67f..d1291a7 100644 --- a/backend/src/main/java/com/example/backend/anwprj/Semesters/Semester.java +++ b/backend/src/main/java/com/example/backend/anwprj/Semesters/Semester.java @@ -6,13 +6,17 @@ public class Semester private int startweeknumber; private int endweeknumber; private String name; + private int startyear; + private int endyear; - public Semester(int id, int startweeknumber, int endweeknumber, String name) + public Semester(int id, int startweeknumber, int endweeknumber, String name, int startyear, int endyear) { this.id = id; this.startweeknumber = startweeknumber; this.endweeknumber = endweeknumber; this.name = name; + this.startyear = startyear; + this.endyear = endyear; } public int getId() @@ -34,4 +38,14 @@ public class Semester { return name; } + + public int getStartYear() + { + return startyear; + } + + public int getEndYear() + { + return endyear; + } }