Se limpio minimamente el modelo de version
This commit is contained in:
BIN
dist/Programa Caja.jar
vendored
BIN
dist/Programa Caja.jar
vendored
Binary file not shown.
@@ -28,11 +28,9 @@ public class SQLiteVersionDAO extends VersionDAO {
|
||||
private boolean tableVersionsExists() {
|
||||
try {
|
||||
DatabaseMetaData md = this.connectionHolder.getConnection().getMetaData();
|
||||
ResultSet rs = md.getTables(null, null, "version", null);
|
||||
boolean exists = rs.next();
|
||||
rs.close();
|
||||
|
||||
return exists;
|
||||
try(ResultSet rs = md.getTables(null, null, "version", null)) {
|
||||
return rs.next();
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
return false;
|
||||
@@ -41,17 +39,14 @@ public class SQLiteVersionDAO extends VersionDAO {
|
||||
|
||||
private int getCurrentVersion() {
|
||||
if (tableVersionsExists()) {
|
||||
String query = "SELECT version FROM version LIMIT 1";
|
||||
try (Connection conn = this.connectionHolder.getConnection()) {
|
||||
String query = "SELECT version FROM version LIMIT 1";
|
||||
PreparedStatement ps = conn.prepareStatement(query);
|
||||
ResultSet rs = ps.executeQuery();
|
||||
|
||||
rs.next();
|
||||
int version = rs.getInt(1);
|
||||
|
||||
rs.close();
|
||||
ps.close();
|
||||
return version;
|
||||
try (PreparedStatement ps = conn.prepareStatement(query)) {
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
rs.next();
|
||||
return rs.getInt(1);
|
||||
}
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
LOGGER.log(Level.SEVERE, e.toString(), e);
|
||||
}
|
||||
@@ -77,17 +72,16 @@ public class SQLiteVersionDAO extends VersionDAO {
|
||||
|
||||
private void executeVersionScript(int version) {
|
||||
try (Connection conn = this.connectionHolder.getConnection()) {
|
||||
Statement statement = conn.createStatement();
|
||||
InputStream inputStream = getVersionScript(version);
|
||||
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
statement.addBatch(line);
|
||||
try(Statement statement = conn.createStatement()) {
|
||||
InputStream inputStream = getVersionScript(version);
|
||||
try(BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
statement.addBatch(line);
|
||||
}
|
||||
}
|
||||
statement.executeBatch();
|
||||
}
|
||||
reader.close();
|
||||
|
||||
statement.executeBatch();
|
||||
statement.close();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
LOGGER.log(Level.SEVERE, e.toString(), e);
|
||||
@@ -104,5 +98,4 @@ public class SQLiteVersionDAO extends VersionDAO {
|
||||
executeVersionScript(currentVersion);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user