frosch95/GeoFroggerFX
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed from file to resource input stream to read the update scripts from the jar and not from file system

Browse Source
This commit is contained in:
Andreas Billmann
2015-03-26 23:19:03 +01:00
parent 22e1d3f65e
commit 144c7d6b86
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/de/geofroggerfx/dao/jdbc/DatabaseUpdater.java
View File

@@ -30,12 +30,10 @@ import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.IOException; import java.io.*;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
@@ -70,7 +68,7 @@ public class DatabaseUpdater {
try { try {
URL url = getUpdateFileUrl(version); URL url = getUpdateFileUrl(version);
while(url != null) { while(url != null) {
executeSQL(url); executeSQL(version);
version++; version++;
url = getUpdateFileUrl(version); url = getUpdateFileUrl(version);
} }
@@ -87,11 +85,23 @@ public class DatabaseUpdater {
return DatabaseUpdater.class.getResource(UPDATE_FOLDER+version+SQL_EXTENSION); return DatabaseUpdater.class.getResource(UPDATE_FOLDER+version+SQL_EXTENSION);
} }
private void executeSQL(URL url) throws URISyntaxException, IOException { private void executeSQL(Integer version) throws URISyntaxException, IOException {
List<String> lines = Files.readAllLines(Paths.get(url.toURI()), Charset.defaultCharset());
List<String> statements = extractStatements(lines); List<String> lines = new ArrayList<>();
for (String statement: statements) {
jdbcTemplate.execute(statement); try(InputStream in = DatabaseUpdater.class.getResourceAsStream(UPDATE_FOLDER + version + SQL_EXTENSION);
Reader reader = new InputStreamReader(in, Charset.defaultCharset());
BufferedReader bufferedReader = new BufferedReader(reader)) {
String line;
while ((line = bufferedReader.readLine()) != null) {
lines.add(line);
}
List<String> statements = extractStatements(lines);
for (String statement: statements) {
jdbcTemplate.execute(statement);
}
} }
} }