StephanRichter/Widerhall
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

added tests, preparing submission confirmation

Browse Source
This commit is contained in:
Stephan Richter
2022-04-17 19:52:52 +02:00
parent 6d73018247
commit e2bba174ee
9 changed files with 335 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/main/java/de/srsoftware/widerhall/data/Database.java
View File

@@ -11,7 +11,6 @@ import java.sql.SQLException;
import java.util.*;
import static de.srsoftware.widerhall.Util.t;
import static de.srsoftware.widerhall.Constants.*;
public class Database {
public static final String HASHED_PASS = "hashedPassword";
@@ -21,28 +20,26 @@ public class Database {
private static Database singleton = null;
private final Connection conn;
public Request insertInto(String tbName) {
return query("INSERT INTO "+tbName);
}
public class Request{
private final String sql;
private final StringBuilder sql;
private final HashMap<String, List<Object>> where = new HashMap<>();
private final HashMap<String,Object> values = new HashMap<>();
private final HashMap<String,Object> setValues = new HashMap<>();
public Request(String sql) {
this(new StringBuilder(sql));
}
public Request(StringBuilder sql) {
this.sql = sql;
}
public ResultSet exec() throws SQLException {
var sb = new StringBuilder(sql);
var args = new ArrayList<>();
if (!where.isEmpty()){
var clauses = new ArrayList<String>();
sb.append(" WHERE ");
sql.append(" WHERE ");
for (var entry : where.entrySet()){
var arr = new String[entry.getValue().size()];
@@ -51,13 +48,12 @@ public class Database {
clauses.add("("+entry.getKey()+" IN ("+marks+"))");
args.addAll(entry.getValue());
}
sb.append(String.join(" AND ",clauses));
sql.append(String.join(" AND ",clauses));
}
var sql = sb.toString();
LOG.debug(sql);
LOG.debug("SQL: {}",sql);
try {
var stmt = Database.this.conn.prepareStatement(sql);
var stmt = Database.this.conn.prepareStatement(sql());
if (!args.isEmpty()) {
for (int i = 0; i < args.size(); i++) stmt.setObject(i+1, args.get(i));
}
@@ -68,7 +64,6 @@ public class Database {
}
public void run() throws SQLException {
var sb = new StringBuilder(sql);
var args = new ArrayList<>();
if (!setValues.isEmpty()){
@@ -78,7 +73,7 @@ public class Database {
expressions.add(" SET "+entry.getKey()+" = ?");
args.add(entry.getValue());
}
sb.append(String.join(", ",expressions));
sql.append(String.join(", ",expressions));
}
if (!values.isEmpty()){
@@ -87,19 +82,19 @@ public class Database {
keys.add(entry.getKey());
args.add(entry.getValue());
}
sb.append("(")
sql.append("(")
.append(String.join(", ",keys))
.append(")")
.append(" VALUES ");
var arr = new String[args.size()];
Arrays.fill(arr,"?");
var marks = String.join(", ",arr);
sb.append("(").append(marks).append(")");
sql.append("(").append(marks).append(")");
}
if (!where.isEmpty()){
var clauses = new ArrayList<String>();
sb.append(" WHERE ");
sql.append(" WHERE ");
for (var entry : where.entrySet()){
var arr = new String[entry.getValue().size()];
@@ -108,13 +103,12 @@ public class Database {
clauses.add("("+entry.getKey()+" IN ("+marks+"))");
args.addAll(entry.getValue());
}
sb.append(String.join(" AND ",clauses));
sql.append(String.join(" AND ",clauses));
}
var sql = sb.toString();
LOG.debug(sql);
LOG.debug("SQL: {}",sql);
try {
var stmt = conn.prepareStatement(sql);
var stmt = conn.prepareStatement(sql());
if (!args.isEmpty()) {
for (int i = 0; i < args.size(); i++) stmt.setObject(i+1, args.get(i));
}
@@ -129,6 +123,10 @@ public class Database {
return this;
}
public String sql() {
return sql.toString();
}
public Request where(String key, Object ... values) {
for (var val : values) where(key,val);
@@ -169,6 +167,18 @@ public class Database {
return this;
}
public Request deleteFrom(String tableName){
return new Request(new StringBuilder("DELETE FROM ").append(tableName).append(" "));
}
public Request insertInto(String tableName){
return new Request(new StringBuilder("INSERT INTO ").append(tableName).append(" "));
}
public boolean isOpen() {
return conn instanceof Connection;
}
public static Database open() {
if (singleton == null){
Configuration config = Configuration.instance();
@@ -186,13 +196,27 @@ public class Database {
return singleton;
}
public Request query(String sql) {
public Request query(StringBuilder sql) {
return new Request(sql);
}
private boolean tableExists(String tbName) throws SQLException {
public Request select(String tableName,String ... fields) {
StringBuilder sql = new StringBuilder("SELECT ");
if (fields == null || fields.length == 0){
sql.append("*");
} else {
sql.append(String.join(", ",fields));
}
return new Request(sql.append(" FROM ").append(tableName));
}
public boolean tableExists(String tbName) throws SQLException {
try {
ResultSet rs = query("SELECT EXISTS (SELECT name FROM sqlite_schema WHERE type='table' AND name='" + tbName + "')").exec();
var sql = new StringBuilder("SELECT EXISTS (SELECT name FROM sqlite_schema WHERE type='table' AND name='")
.append(tbName)
.append("')");
ResultSet rs = query( sql).exec();
int val = 0;
if (rs.next()) val = rs.getInt(1);
rs.close();
@@ -201,4 +225,12 @@ public class Database {
throw new SQLException(t("Was not able to check existence of table {}!",tbName),e);
}
}
public Request update(String tableName,String ...expressions) {
var sql = new StringBuilder("UPDATE ").append(tableName);
if (expressions != null && expressions.length > 0) {
sql.append(" SET ").append(String.join(", ",expressions));
}
return new Request(sql);
}
}