Qortal/qortal
Qortal/qortal
3
0
Fork 3
mirror of https://github.com/Qortal/qortal.git synced 2025-02-11 17:55:50 +00:00
Code Issues Projects Releases Wiki Activity

qualified Groups table name, so it will be compatible with HSQLDB updated release which uses Groups for as a reserved word

Browse Source
This commit is contained in:
kennycud 2024-12-30 16:01:53 -08:00
parent c2ba9d142c
commit ebc58c5c5c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/qortal/repository/hsqldb/transaction/HSQLDBTransactionRepository.java
View File

@ -1125,12 +1125,12 @@ public class HSQLDBTransactionRepository implements TransactionRepository {
public List<TransactionData> getApprovalPendingTransactions(int blockHeight) throws DataException { public List<TransactionData> getApprovalPendingTransactions(int blockHeight) throws DataException {
StringBuilder sql = new StringBuilder(512); StringBuilder sql = new StringBuilder(512);
sql.append("SELECT signature FROM Transactions " 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 = "); + "WHERE Transactions.approval_status = ");
// Enum int value safe to use literally // Enum int value safe to use literally
sql.append(ApprovalStatus.PENDING.value); 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<TransactionData> transactions = new ArrayList<>(); List<TransactionData> transactions = new ArrayList<>();
@ -1160,12 +1160,12 @@ public class HSQLDBTransactionRepository implements TransactionRepository {
public List<TransactionData> getApprovalExpiringTransactions(int blockHeight) throws DataException { public List<TransactionData> getApprovalExpiringTransactions(int blockHeight) throws DataException {
StringBuilder sql = new StringBuilder(512); StringBuilder sql = new StringBuilder(512);
sql.append("SELECT signature FROM Transactions " 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 = "); + "WHERE Transactions.approval_status = ");
// Enum int value safe to use literally // Enum int value safe to use literally
sql.append(ApprovalStatus.PENDING.value); 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<TransactionData> transactions = new ArrayList<>(); List<TransactionData> transactions = new ArrayList<>();