From ebc58c5c5cd2ac5a5d1ab46a9cba8a9c0d4ad9cd Mon Sep 17 00:00:00 2001 From: kennycud Date: Mon, 30 Dec 2024 16:01:53 -0800 Subject: [PATCH] qualified Groups table name, so it will be compatible with HSQLDB updated release which uses Groups for as a reserved word --- .../hsqldb/transaction/HSQLDBTransactionRepository.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransactionRepository.java b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransactionRepository.java index fe0b4d0b..d31011c9 100644 --- a/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransactionRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransactionRepository.java @@ -1125,12 +1125,12 @@ public class HSQLDBTransactionRepository implements TransactionRepository { public List getApprovalPendingTransactions(int blockHeight) throws DataException { StringBuilder sql = new StringBuilder(512); sql.append("SELECT signature FROM Transactions " - + "JOIN Groups on Groups.group_id = Transactions.tx_group_id " + + "JOIN `Groups` g on g.group_id = Transactions.tx_group_id " + "WHERE Transactions.approval_status = "); // Enum int value safe to use literally sql.append(ApprovalStatus.PENDING.value); - sql.append(" AND Transactions.block_height < ? - Groups.min_block_delay"); + sql.append(" AND Transactions.block_height < ? - g.min_block_delay"); List transactions = new ArrayList<>(); @@ -1160,12 +1160,12 @@ public class HSQLDBTransactionRepository implements TransactionRepository { public List getApprovalExpiringTransactions(int blockHeight) throws DataException { StringBuilder sql = new StringBuilder(512); sql.append("SELECT signature FROM Transactions " - + "JOIN Groups on Groups.group_id = Transactions.tx_group_id " + + "JOIN `Groups` g on g.group_id = Transactions.tx_group_id " + "WHERE Transactions.approval_status = "); // Enum int value safe to use literally sql.append(ApprovalStatus.PENDING.value); - sql.append(" AND Transactions.block_height < ? - Groups.max_block_delay"); + sql.append(" AND Transactions.block_height < ? - g.max_block_delay"); List transactions = new ArrayList<>();