Merge branch 'main' into lang_de
This commit is contained in:
@@ -33,6 +33,7 @@ public class Configuration {
|
||||
public Configuration load(File file) {
|
||||
this.file = file;
|
||||
if (file.exists()) try {
|
||||
LOG.info("Loading configuration from {}",file);
|
||||
var newVals = (JSONObject) new JSONParser().parse(Files.readString(file.toPath()));
|
||||
data.putAll(newVals);
|
||||
} catch (ParseException | IOException e){
|
||||
|
||||
@@ -54,4 +54,4 @@ public class DatabaseTest extends TestCase {
|
||||
assertEquals("UPDATE Test SET x = 5",Database.open().update("Test").set("x",5).compile().toString());
|
||||
assertEquals("UPDATE Test SET x = 5, y = 6",Database.open().update("Test").set("x",5).set("y",6).compile().toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user