From 5a25d77d15200eada79c12f3ab5569a672a388cf Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 21 Jun 2019 14:36:22 +0100 Subject: [PATCH] Add migration that drops offers table. --- .../briarproject/bramble/db/JdbcDatabase.java | 6 +-- .../bramble/db/Migration48_49.java | 40 +++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 bramble-core/src/main/java/org/briarproject/bramble/db/Migration48_49.java diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java index 777cbe04a..47b1183c0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java @@ -99,7 +99,7 @@ import static org.briarproject.bramble.util.LogUtils.now; abstract class JdbcDatabase implements Database { // Package access for testing - static final int CODE_SCHEMA_VERSION = 48; + static final int CODE_SCHEMA_VERSION = 49; // Time period offsets for incoming transport keys private static final int OFFSET_PREV = -1; @@ -458,7 +458,6 @@ abstract class JdbcDatabase implements Database { // Package access for testing List> getMigrations() { return asList( - // TODO: Add migration that drops offers table new Migration38_39(), new Migration39_40(), new Migration40_41(dbTypes), @@ -468,7 +467,8 @@ abstract class JdbcDatabase implements Database { new Migration44_45(), new Migration45_46(), new Migration46_47(dbTypes), - new Migration47_48(dbTypes) + new Migration47_48(dbTypes), + new Migration48_49() ); } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/Migration48_49.java b/bramble-core/src/main/java/org/briarproject/bramble/db/Migration48_49.java new file mode 100644 index 000000000..ef68fb1ed --- /dev/null +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/Migration48_49.java @@ -0,0 +1,40 @@ +package org.briarproject.bramble.db; + +import org.briarproject.bramble.api.db.DbException; + +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.logging.Logger; + +import static java.util.logging.Level.WARNING; +import static java.util.logging.Logger.getLogger; +import static org.briarproject.bramble.db.JdbcUtils.tryToClose; + +class Migration48_49 implements Migration { + + private static final Logger LOG = getLogger(Migration48_49.class.getName()); + + @Override + public int getStartVersion() { + return 48; + } + + @Override + public int getEndVersion() { + return 49; + } + + @Override + public void migrate(Connection txn) throws DbException { + Statement s = null; + try { + s = txn.createStatement(); + s.execute("DROP TABLE offers"); + s.close(); + } catch (SQLException e) { + tryToClose(s, LOG, WARNING); + throw new DbException(e); + } + } +}