ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Added ignored tables to DBUpgrader

Browse source
This commit is contained in:
Ziver Koc 2016-01-04 19:20:40 +01:00
parent d7637da980
commit ee3356c6c9
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Zutil.jar
View file

Binary file not shown.

25
src/zutil/db/DBUpgradeHandler.java
View file

@ -11,6 +11,7 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -29,10 +30,12 @@ public class DBUpgradeHandler {
private DBConnection target; private DBConnection target;
private boolean forceUpgradeEnabled = false; private boolean forceUpgradeEnabled = false;
private HashMap<String,String> tableRenameMap; private HashMap<String,String> tableRenameMap;
private HashSet<String> ignoredTablesSet;
public DBUpgradeHandler(DBConnection reference){ public DBUpgradeHandler(DBConnection reference){
this.tableRenameMap = new HashMap<>(); this.tableRenameMap = new HashMap<>();
this.ignoredTablesSet = new HashSet<>();
this.reference = reference; this.reference = reference;
} }
@ -50,6 +53,13 @@ public class DBUpgradeHandler {
this.tableRenameMap.put(oldTableName, newTableName); this.tableRenameMap.put(oldTableName, newTableName);
} }
/**
* @param table a table name that will be ignored from the upgrade procedure
*/
public void addIgnoredTable(String table){
ignoredTablesSet.add(table);
}
/** /**
* With the default behaviour unnecessary columns will not be removed. * With the default behaviour unnecessary columns will not be removed.
* But if forced upgrade is set to true then the upgrade handler will * But if forced upgrade is set to true then the upgrade handler will
@ -61,6 +71,7 @@ public class DBUpgradeHandler {
this.forceUpgradeEnabled = enable; this.forceUpgradeEnabled = enable;
} }
public void upgrade() throws SQLException { public void upgrade() throws SQLException {
try { try {
logger.fine("Starting upgrade transaction..."); logger.fine("Starting upgrade transaction...");
@ -204,8 +215,18 @@ public class DBUpgradeHandler {
} }
private static List<String> getTableList(DBConnection db) throws SQLException { private List<String> getTableList(DBConnection db) throws SQLException {
return db.exec("SELECT name FROM sqlite_master WHERE type='table';", new ListSQLResult<String>()); return db.exec("SELECT name FROM sqlite_master WHERE type='table';", new SQLResultHandler<List<String>>() {
public List<String> handleQueryResult(Statement stmt, ResultSet result) throws SQLException {
ArrayList<String> list = new ArrayList<String>();
while( result.next() ) {
String table = result.getString(1);
if(!ignoredTablesSet.contains(table))
list.add(result.getString(1));
}
return list;
}
});
} }
private static String getTableSql(DBConnection db, String table) throws SQLException { private static String getTableSql(DBConnection db, String table) throws SQLException {
PreparedStatement stmt = db.getPreparedStatement("SELECT sql FROM sqlite_master WHERE name == ?"); PreparedStatement stmt = db.getPreparedStatement("SELECT sql FROM sqlite_master WHERE name == ?");