Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

[bramble] address review comments

Browse Source
This commit is contained in:
Torsten Grote
2018-10-30 13:32:56 -03:00
parent 969150bff0
commit ca700d8d23
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseTypes.java
View File

@@ -3,7 +3,7 @@ package org.briarproject.bramble.db;
class DatabaseTypes { class DatabaseTypes {
private final String hashType, secretType, binaryType; private final String hashType, secretType, binaryType;
private final String counterType, stringType; private final String counterType, stringType;
public DatabaseTypes(String hashType, String secretType, String binaryType, public DatabaseTypes(String hashType, String secretType, String binaryType,
String counterType, String stringType) { String counterType, String stringType) {
@@ -17,11 +17,11 @@ class DatabaseTypes {
/** /**
* Replaces database type placeholders in a statement with the actual types. * Replaces database type placeholders in a statement with the actual types.
* These placeholders are currently supported: * These placeholders are currently supported:
* <li> _HASH * <li> _HASH
* <li> _SECRET * <li> _SECRET
* <li> _BINARY * <li> _BINARY
* <li> _COUNTER * <li> _COUNTER
* <li> _STRING * <li> _STRING
*/ */
String replaceTypes(String s) { String replaceTypes(String s) {
s = s.replaceAll("_HASH", hashType); s = s.replaceAll("_HASH", hashType);

2
bramble-core/src/main/java/org/briarproject/bramble/db/Migration40_41.java
View File

@@ -39,7 +39,7 @@ class Migration40_41 implements Migration<Connection> {
try { try {
s = txn.createStatement(); s = txn.createStatement();
s.execute("ALTER TABLE contacts" s.execute("ALTER TABLE contacts"
+ dbTypes.replaceTypes(" ADD alias VARCHAR")); + dbTypes.replaceTypes(" ADD alias _STRING"));
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(s); tryToClose(s);
throw new DbException(e); throw new DbException(e);