From ee3356c6c93fd4130598fac54da864ec9e5c1cb5 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 4 Jan 2016 19:20:40 +0100 Subject: [PATCH] Added ignored tables to DBUpgrader --- Zutil.jar | Bin 1189713 -> 1190569 bytes src/zutil/db/DBUpgradeHandler.java | 25 +++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Zutil.jar b/Zutil.jar index 4525eff869a2f49ae7ebe9e5e2c28bb8e52810c8..10177f40de847730500b1da85b67b1ad49f38e03 100755 GIT binary patch delta 13526 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 diff --git a/src/zutil/db/DBUpgradeHandler.java b/src/zutil/db/DBUpgradeHandler.java index 505e350..05b60a7 100755 --- a/src/zutil/db/DBUpgradeHandler.java +++ b/src/zutil/db/DBUpgradeHandler.java @@ -11,6 +11,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -29,10 +30,12 @@ public class DBUpgradeHandler { private DBConnection target; private boolean forceUpgradeEnabled = false; private HashMap tableRenameMap; + private HashSet ignoredTablesSet; public DBUpgradeHandler(DBConnection reference){ this.tableRenameMap = new HashMap<>(); + this.ignoredTablesSet = new HashSet<>(); this.reference = reference; } @@ -50,6 +53,13 @@ public class DBUpgradeHandler { 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. * But if forced upgrade is set to true then the upgrade handler will @@ -61,6 +71,7 @@ public class DBUpgradeHandler { this.forceUpgradeEnabled = enable; } + public void upgrade() throws SQLException { try { logger.fine("Starting upgrade transaction..."); @@ -204,8 +215,18 @@ public class DBUpgradeHandler { } - private static List getTableList(DBConnection db) throws SQLException { - return db.exec("SELECT name FROM sqlite_master WHERE type='table';", new ListSQLResult()); + private List getTableList(DBConnection db) throws SQLException { + return db.exec("SELECT name FROM sqlite_master WHERE type='table';", new SQLResultHandler>() { + public List handleQueryResult(Statement stmt, ResultSet result) throws SQLException { + ArrayList list = new ArrayList(); + 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 { PreparedStatement stmt = db.getPreparedStatement("SELECT sql FROM sqlite_master WHERE name == ?");