fixed database table creation
This commit is contained in:
@@ -13,10 +13,11 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static de.srsoftware.widerhall.data.Database.*;
|
||||
import static de.srsoftware.widerhall.Constants.*;
|
||||
|
||||
public class User {
|
||||
public static final String TABLE_NAME = "Users";
|
||||
private static final Logger LOG = LoggerFactory.getLogger(User.class);
|
||||
private static Database database = Database.open();
|
||||
private String email, salt, hashedPass, name;
|
||||
|
||||
public User(String email, String name, String salt, String hashedPass) {
|
||||
@@ -32,7 +33,17 @@ public class User {
|
||||
return new User(email,name,salt,hashedPass).save();
|
||||
}
|
||||
|
||||
|
||||
public static void createTable() throws SQLException {
|
||||
var sql = new StringBuilder()
|
||||
.append("CREATE TABLE ").append(TABLE_NAME)
|
||||
.append(" (")
|
||||
.append(EMAIL).append(" ").append(VARCHAR).append(" NOT NULL PRIMARY KEY, ")
|
||||
.append(SALT).append(" ").append(VARCHAR).append(", ")
|
||||
.append(HASHED_PASS).append(" ").append(VARCHAR).append(", ")
|
||||
.append(NAME).append(" ").append(VARCHAR)
|
||||
.append(");");
|
||||
Database.open().query(sql.toString()).run();
|
||||
}
|
||||
|
||||
public String email() {
|
||||
return email;
|
||||
@@ -51,7 +62,7 @@ public class User {
|
||||
public static List<User> list() {
|
||||
var userList = new ArrayList<User>();
|
||||
try {
|
||||
var rs = database.query("SELECT * FROM Users").exec();
|
||||
var rs = Database.open().query("SELECT * FROM Users").exec();
|
||||
while (rs.next()){
|
||||
var email = rs.getString(EMAIL);
|
||||
var name = rs.getString(NAME);
|
||||
@@ -66,7 +77,7 @@ public class User {
|
||||
}
|
||||
|
||||
public static User load(String email, String password) throws InvalidKeyException, SQLException {
|
||||
ResultSet rs = database
|
||||
ResultSet rs = Database.open()
|
||||
.query("SELECT * FROM Users")
|
||||
.where(EMAIL,email)
|
||||
.exec();
|
||||
@@ -102,7 +113,7 @@ public class User {
|
||||
}
|
||||
|
||||
public static boolean noUsers() throws SQLException {
|
||||
var rs = database.query("SELECT count(*) FROM users").exec();
|
||||
var rs = Database.open().query("SELECT count(*) FROM users").exec();
|
||||
try {
|
||||
if (rs.next()) {
|
||||
return rs.getInt(1) < 1;
|
||||
@@ -114,7 +125,7 @@ public class User {
|
||||
}
|
||||
|
||||
private User save() throws SQLException {
|
||||
database.insertInto("Users")
|
||||
Database.open().insertInto(TABLE_NAME)
|
||||
.values(Map.of(EMAIL,email,NAME,name,SALT,salt,HASHED_PASS,hashedPass))
|
||||
.run();
|
||||
return this;
|
||||
|
||||
Reference in New Issue
Block a user