From f9265540957d8acdd040e2b36942fcb351edcf6c Mon Sep 17 00:00:00 2001
From: Rhys Nute <nuterd@cardiff.ac.uk>
Date: Thu, 30 Nov 2023 08:55:39 +0000
Subject: [PATCH] database Update
---
.../java/Team5/SmartTowns/Data/UserController.java | 2 +-
.../Team5/SmartTowns/Data/UserRepositoryJDBC.java | 2 +-
src/main/resources/application.properties | 2 +-
src/main/resources/landmarkSchema.sql | 5 +++++
src/main/resources/schema.sql | 11 +++++------
src/main/resources/userData.sql | 2 ++
6 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/Team5/SmartTowns/Data/UserController.java b/src/main/java/Team5/SmartTowns/Data/UserController.java
index 3d448763..a492d252 100644
--- a/src/main/java/Team5/SmartTowns/Data/UserController.java
+++ b/src/main/java/Team5/SmartTowns/Data/UserController.java
@@ -21,7 +21,7 @@ public class UserController {
@GetMapping("/userList")
public ModelAndView userList(){
- ModelAndView mav = new ModelAndView("users.html");
+ ModelAndView mav = new ModelAndView("usersData.sql");
List<user> users = userRepository.getAllUsers();
mav.addObject("users", users);
return mav;
diff --git a/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java
index 00ac1d21..17f15f9c 100644
--- a/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java
@@ -29,7 +29,7 @@ public class UserRepositoryJDBC implements UserRepository{
@Override
public List<user> getAllUsers(){
- String sql = "select * from User";
+ String sql = "select * from user";
return jdbc.query(sql, userMapper);
}
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 17a2909d..a2946a6f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:mariadb://localhost:3306/Towns
+spring.datasource.url=jdbc:mariadb://localhost:3306/Smart_Towns
spring.datasource.username=root
spring.datasource.password=comsc
diff --git a/src/main/resources/landmarkSchema.sql b/src/main/resources/landmarkSchema.sql
index e69de29b..413ba53c 100644
--- a/src/main/resources/landmarkSchema.sql
+++ b/src/main/resources/landmarkSchema.sql
@@ -0,0 +1,5 @@
+drop table if exists landmarks;
+create table if not exists landmarks(
+landmarksId bigint auto_increment primary key,
+name varchar(100)
+) engine=InnoDB;
\ No newline at end of file
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 95d37883..59b7fb68 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -1,12 +1,11 @@
drop table if exists trails;
create table if not exists trails(
- trailID bigint auto_increment primary key
-) engine=InnoDB;
-drop table if exists location;
-create table if not exists location(
- locationID bigint auto_increment primary key
+ trailID bigint auto_increment primary key,
+ name varchar(100)
) engine=InnoDB;
+
drop table if exists users;
create table if not exists users(
- userID bigint auto_increment primary key
+ userID bigint auto_increment primary key,
+ name varchar(100)
) engine=InnoDB;
\ No newline at end of file
diff --git a/src/main/resources/userData.sql b/src/main/resources/userData.sql
index e69de29b..54560790 100644
--- a/src/main/resources/userData.sql
+++ b/src/main/resources/userData.sql
@@ -0,0 +1,2 @@
+DELETE from users
+INSERT INTO users (userId) VALUES (1)
\ No newline at end of file
--
GitLab