diff --git a/src/main/java/Team5/SmartTowns/Data/UserController.java b/src/main/java/Team5/SmartTowns/Data/UserController.java index 3d4487631b2ecf2b3aa41178dbe605957ca9524b..a492d25297c7b398f16bb086e81b83869e93f8cd 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 00ac1d212f3f10d669d78225c75079bf151b8748..17f15f9c465c85e6fe552108b906ef4b1c9e14fd 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 17a2909d53e44fc2047ffc90a88d69d64506dfc5..a2946a6f5b8b027552e20be691b7e8f0fe9164d6 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..413ba53c52e76874b569cc795ecd742567fe2c56 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 95d37883734a52617f095531a2d731c04a65f2e1..59b7fb68099aacbc8ef7857a18452c077ee2210a 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..54560790219c59003fb4202f3914f03d66bc1987 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