From 4b2d588a8148b2af71c740c7c8681bd10c428251 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 14 May 2022 21:33:13 +0200
Subject: [PATCH] #663 - fixed sequences reset: avoid number formatting
---
.../databasemigrator/listener/GenericStepListener.java | 4 ++--
.../budgetmaster/databasemigrator/UpdateSequencesTest.java | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/listener/GenericStepListener.java b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/listener/GenericStepListener.java
index 4ca30d9f1..2ae0680c0 100644
--- a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/listener/GenericStepListener.java
+++ b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/listener/GenericStepListener.java
@@ -53,8 +53,8 @@ public class GenericStepListener<T extends ProvidesID> implements StepExecutionL
{
final int highestUsedID = getHighestUsedID();
final int newSequence = highestUsedID + 1;
- LOGGER.debug("Adjusting sequence to {} ({})", newSequence, highestUsedID);
- jdbcTemplate.update(MessageFormat.format("ALTER SEQUENCE {0}_id_seq RESTART WITH {1}", tableName, newSequence));
+ LOGGER.debug("Adjusting sequence to {} (highest used id: {})", newSequence, highestUsedID);
+ jdbcTemplate.update(MessageFormat.format("ALTER SEQUENCE {0}_id_seq RESTART WITH {1}", tableName, String.valueOf(newSequence)));
}
return null;
diff --git a/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/UpdateSequencesTest.java b/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/UpdateSequencesTest.java
index fd5824b0e..a1bdaaee6 100644
--- a/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/UpdateSequencesTest.java
+++ b/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/UpdateSequencesTest.java
@@ -63,5 +63,8 @@ class UpdateSequencesTest extends MigratorTestBase
final List<DestinationCategory> categoriesOrderedById = categoryRepository.findAllByOrderByIDDesc();
final DestinationCategory savedCategory = categoryRepository.save(new DestinationCategory(null, "New One", "#ffffff", 0, null));
assertThat(savedCategory.getID()).isEqualTo(categoriesOrderedById.get(0).getID() + 1);
+
+ final DestinationCategory savedCategory2 = categoryRepository.save(new DestinationCategory(null, "New Two", "#ffffff", 0, null));
+ assertThat(savedCategory2.getID()).isEqualTo(categoriesOrderedById.get(0).getID() + 2);
}
}
\ No newline at end of file
--
GitLab