From 8a04aee47eb0f59219c0d3e55e73b765f5e60327 Mon Sep 17 00:00:00 2001
From: Rhys Nute <nuterd@cardiff.ac.uk>
Date: Tue, 28 Nov 2023 16:30:00 +0000
Subject: [PATCH] database template
---
src/data.sql | 0
.../java/Team5/SmartTowns/Data/UserRepository.java | 3 +++
.../Team5/SmartTowns/Data/UserRepositoryJDBC.java | 2 +-
src/main/resources/application.properties | 2 +-
src/main/resources/schema.sql | 12 ++++++++++++
src/main/resources/static/users.html | 10 ++++++++++
6 files changed, 27 insertions(+), 2 deletions(-)
delete mode 100644 src/data.sql
create mode 100644 src/main/resources/schema.sql
create mode 100644 src/main/resources/static/users.html
diff --git a/src/data.sql b/src/data.sql
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/main/java/Team5/SmartTowns/Data/UserRepository.java b/src/main/java/Team5/SmartTowns/Data/UserRepository.java
index aea6a6f3..80e0dc68 100644
--- a/src/main/java/Team5/SmartTowns/Data/UserRepository.java
+++ b/src/main/java/Team5/SmartTowns/Data/UserRepository.java
@@ -2,7 +2,10 @@ package Team5.SmartTowns.Data;
import java.util.List;
+
public interface UserRepository {
List<user> getAllUsers();
+
+
}
diff --git a/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java
index 17f15f9c..00ac1d21 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 f1e9fb7c..95f46c69 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:mariadb://localhost3306/Towns
+spring.datasource.url=jdbc:mariadb://localhost:3306/towns
spring.datasource.username=root
spring.datasource.password=comsc
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
new file mode 100644
index 00000000..95d37883
--- /dev/null
+++ b/src/main/resources/schema.sql
@@ -0,0 +1,12 @@
+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
+) engine=InnoDB;
+drop table if exists users;
+create table if not exists users(
+ userID bigint auto_increment primary key
+) engine=InnoDB;
\ No newline at end of file
diff --git a/src/main/resources/static/users.html b/src/main/resources/static/users.html
new file mode 100644
index 00000000..566549bd
--- /dev/null
+++ b/src/main/resources/static/users.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
--
GitLab