From 2556b8bf50075d6c1c9ad91b821d874c131416be Mon Sep 17 00:00:00 2001 From: brausjonas Date: Mon, 8 May 2023 13:06:36 +0200 Subject: [PATCH] semester database with start and end year extended --- backend/database.mv.db | Bin 32768 -> 32768 bytes backend/database.trace.db | 4 ++++ .../backend/anwprj/DataBaseHandler.java | 6 ++++-- .../backend/anwprj/Semesters/Semester.java | 16 +++++++++++++++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/backend/database.mv.db b/backend/database.mv.db index 8abdd0de52052f6788eac947efe5bb5a2615b028..1b555f71fd562c4f6f51e0e8884eb446498000f9 100644 GIT binary patch literal 32768 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 Y*#BqA{C}Q-Vfv%N;Do;N45zRD9~y}ElK=n! 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; + } }