From 9b2c8b0f986241006e3f5a9357d50146993669e2 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 5 Sep 2023 10:37:07 +0100 Subject: [PATCH] Fix default value for sync versions. --- .../java/org/briarproject/bramble/db/JdbcDatabase.java | 3 +-- .../org/briarproject/bramble/db/HyperSqlDatabaseTest.java | 2 ++ .../org/briarproject/bramble/db/SqliteDatabaseTest.java | 7 ++----- 3 files changed, 5 insertions(+), 7 deletions(-) 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 05bb2af46..280b946d2 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 @@ -143,8 +143,7 @@ abstract class JdbcDatabase implements Database { + " handshakePublicKey _BINARY," // Null if key is unknown + " localAuthorId _HASH NOT NULL," + " verified BOOLEAN NOT NULL," - // FIXME: SQLite interprets default '00' as string - + " syncVersions _BINARY DEFAULT '00' NOT NULL," + + " syncVersions _BINARY DEFAULT x'00' NOT NULL," + " FOREIGN KEY (localAuthorId)" + " REFERENCES localAuthors (authorId)" + " ON DELETE CASCADE)"; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabaseTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabaseTest.java index 10b598367..0e7742fc3 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabaseTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabaseTest.java @@ -10,9 +10,11 @@ import static org.junit.Assume.assumeTrue; public class HyperSqlDatabaseTest extends JdbcDatabaseTest { + @Override @Before public void setUp() { assumeTrue(isCryptoStrengthUnlimited()); + super.setUp(); } @Override diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/SqliteDatabaseTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/SqliteDatabaseTest.java index d7bb9e4d4..4cd41a9c5 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/SqliteDatabaseTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/SqliteDatabaseTest.java @@ -10,9 +10,11 @@ import static org.junit.Assume.assumeTrue; public class SqliteDatabaseTest extends JdbcDatabaseTest { + @Override @Before public void setUp() { assumeTrue(isCryptoStrengthUnlimited()); + super.setUp(); } @Override @@ -20,9 +22,4 @@ public class SqliteDatabaseTest extends JdbcDatabaseTest { MessageFactory messageFactory, Clock clock) { return new SqliteDatabase(config, messageFactory, clock); } - - @Override - public void testSyncVersions() { - // FIXME: Remove override when issue with default value is fixed - } }