From ca700d8d23d85b49ee432e08001a829c3afece2b Mon Sep 17 00:00:00 2001 From: Torsten Grote <t@grobox.de> Date: Tue, 30 Oct 2018 13:32:56 -0300 Subject: [PATCH] [bramble] address review comments --- .../org/briarproject/bramble/db/DatabaseTypes.java | 12 ++++++------ .../org/briarproject/bramble/db/Migration40_41.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseTypes.java b/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseTypes.java index 3a807bd562..55a557d755 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseTypes.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseTypes.java @@ -3,7 +3,7 @@ package org.briarproject.bramble.db; class DatabaseTypes { private final String hashType, secretType, binaryType; - private final String counterType, stringType; + private final String counterType, stringType; public DatabaseTypes(String hashType, String secretType, String binaryType, String counterType, String stringType) { @@ -17,11 +17,11 @@ class DatabaseTypes { /** * Replaces database type placeholders in a statement with the actual types. * These placeholders are currently supported: - * <li> _HASH - * <li> _SECRET - * <li> _BINARY - * <li> _COUNTER - * <li> _STRING + * <li> _HASH + * <li> _SECRET + * <li> _BINARY + * <li> _COUNTER + * <li> _STRING */ String replaceTypes(String s) { s = s.replaceAll("_HASH", hashType); diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/Migration40_41.java b/bramble-core/src/main/java/org/briarproject/bramble/db/Migration40_41.java index 59bc567cb5..efd3644f94 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/Migration40_41.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/Migration40_41.java @@ -39,7 +39,7 @@ class Migration40_41 implements Migration<Connection> { try { s = txn.createStatement(); s.execute("ALTER TABLE contacts" - + dbTypes.replaceTypes(" ADD alias VARCHAR")); + + dbTypes.replaceTypes(" ADD alias _STRING")); } catch (SQLException e) { tryToClose(s); throw new DbException(e); -- GitLab