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

rollback the Groups table back quotes, because this only works with my testing environment and causes problems in production

Browse Source
This commit is contained in:
kennycud 2024-12-31 13:57:39 -08:00
parent 278243f01c
commit 8f6b55a98b
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/org/qortal/repository/hsqldb/HSQLDBGroupRepository.java
View File

@ -24,7 +24,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
public GroupData fromGroupId(int groupId) throws DataException { public GroupData fromGroupId(int groupId) throws DataException {
String sql = "SELECT group_name, owner, description, created_when, updated_when, reference, is_open, " String sql = "SELECT group_name, owner, description, created_when, updated_when, reference, is_open, "
+ "approval_threshold, min_block_delay, max_block_delay, creation_group_id, reduced_group_name " + "approval_threshold, min_block_delay, max_block_delay, creation_group_id, reduced_group_name "
+ "FROM `Groups` WHERE group_id = ?"; + "FROM Groups WHERE group_id = ?";
try (ResultSet resultSet = this.repository.checkedExecute(sql, groupId)) { try (ResultSet resultSet = this.repository.checkedExecute(sql, groupId)) {
if (resultSet == null) if (resultSet == null)
@ -62,7 +62,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
public GroupData fromGroupName(String groupName) throws DataException { public GroupData fromGroupName(String groupName) throws DataException {
String sql = "SELECT group_id, owner, description, created_when, updated_when, reference, is_open, " String sql = "SELECT group_id, owner, description, created_when, updated_when, reference, is_open, "
+ "approval_threshold, min_block_delay, max_block_delay, creation_group_id, reduced_group_name " + "approval_threshold, min_block_delay, max_block_delay, creation_group_id, reduced_group_name "
+ "FROM `Groups` WHERE group_name = ?"; + "FROM Groups WHERE group_name = ?";
try (ResultSet resultSet = this.repository.checkedExecute(sql, groupName)) { try (ResultSet resultSet = this.repository.checkedExecute(sql, groupName)) {
if (resultSet == null) if (resultSet == null)
@ -99,7 +99,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
@Override @Override
public boolean groupExists(int groupId) throws DataException { public boolean groupExists(int groupId) throws DataException {
try { try {
return this.repository.exists("`Groups`", "group_id = ?", groupId); return this.repository.exists("Groups", "group_id = ?", groupId);
} catch (SQLException e) { } catch (SQLException e) {
throw new DataException("Unable to check for group in repository", e); throw new DataException("Unable to check for group in repository", e);
} }
@ -108,7 +108,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
@Override @Override
public boolean groupExists(String groupName) throws DataException { public boolean groupExists(String groupName) throws DataException {
try { try {
return this.repository.exists("`Groups`", "group_name = ?", groupName); return this.repository.exists("Groups", "group_name = ?", groupName);
} catch (SQLException e) { } catch (SQLException e) {
throw new DataException("Unable to check for group in repository", e); throw new DataException("Unable to check for group in repository", e);
} }
@ -117,7 +117,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
@Override @Override
public boolean reducedGroupNameExists(String reducedGroupName) throws DataException { public boolean reducedGroupNameExists(String reducedGroupName) throws DataException {
try { try {
return this.repository.exists("`Groups`", "reduced_group_name = ?", reducedGroupName); return this.repository.exists("Groups", "reduced_group_name = ?", reducedGroupName);
} catch (SQLException e) { } catch (SQLException e) {
throw new DataException("Unable to check for reduced group name in repository", e); throw new DataException("Unable to check for reduced group name in repository", e);
} }
@ -129,7 +129,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
sql.append("SELECT group_id, owner, group_name, description, created_when, updated_when, reference, is_open, " sql.append("SELECT group_id, owner, group_name, description, created_when, updated_when, reference, is_open, "
+ "approval_threshold, min_block_delay, max_block_delay, creation_group_id, reduced_group_name " + "approval_threshold, min_block_delay, max_block_delay, creation_group_id, reduced_group_name "
+ "FROM `Groups` ORDER BY group_name"); + "FROM Groups ORDER BY group_name");
if (reverse != null && reverse) if (reverse != null && reverse)
sql.append(" DESC"); sql.append(" DESC");
@ -181,7 +181,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
sql.append("SELECT group_id, group_name, description, created_when, updated_when, reference, is_open, " sql.append("SELECT group_id, group_name, description, created_when, updated_when, reference, is_open, "
+ "approval_threshold, min_block_delay, max_block_delay, creation_group_id, reduced_group_name " + "approval_threshold, min_block_delay, max_block_delay, creation_group_id, reduced_group_name "
+ "FROM `Groups` WHERE owner = ? ORDER BY group_name"); + "FROM Groups WHERE owner = ? ORDER BY group_name");
if (reverse != null && reverse) if (reverse != null && reverse)
sql.append(" DESC"); sql.append(" DESC");
@ -231,7 +231,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
StringBuilder sql = new StringBuilder(512); StringBuilder sql = new StringBuilder(512);
sql.append("SELECT group_id, owner, group_name, description, created_when, updated_when, reference, is_open, " sql.append("SELECT group_id, owner, group_name, description, created_when, updated_when, reference, is_open, "
+ "approval_threshold, min_block_delay, max_block_delay, creation_group_id, reduced_group_name, admin FROM `Groups` " + "approval_threshold, min_block_delay, max_block_delay, creation_group_id, reduced_group_name, admin FROM Groups "
+ "JOIN GroupMembers USING (group_id) " + "JOIN GroupMembers USING (group_id) "
+ "LEFT OUTER JOIN GroupAdmins ON GroupAdmins.group_id = GroupMembers.group_id AND GroupAdmins.admin = GroupMembers.address " + "LEFT OUTER JOIN GroupAdmins ON GroupAdmins.group_id = GroupMembers.group_id AND GroupAdmins.admin = GroupMembers.address "
+ "WHERE address = ? ORDER BY group_name"); + "WHERE address = ? ORDER BY group_name");
@ -289,7 +289,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
@Override @Override
public void save(GroupData groupData) throws DataException { public void save(GroupData groupData) throws DataException {
HSQLDBSaver saveHelper = new HSQLDBSaver("`Groups`"); HSQLDBSaver saveHelper = new HSQLDBSaver("Groups");
saveHelper.bind("group_id", groupData.getGroupId()).bind("owner", groupData.getOwner()).bind("group_name", groupData.getGroupName()) saveHelper.bind("group_id", groupData.getGroupId()).bind("owner", groupData.getOwner()).bind("group_name", groupData.getGroupName())
.bind("description", groupData.getDescription()).bind("created_when", groupData.getCreated()).bind("updated_when", groupData.getUpdated()) .bind("description", groupData.getDescription()).bind("created_when", groupData.getCreated()).bind("updated_when", groupData.getUpdated())
@ -302,7 +302,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
if (groupData.getGroupId() == null) { if (groupData.getGroupId() == null) {
// Fetch new groupId // Fetch new groupId
try (ResultSet resultSet = this.repository.checkedExecute("SELECT group_id FROM `Groups` WHERE reference = ?", groupData.getReference())) { try (ResultSet resultSet = this.repository.checkedExecute("SELECT group_id FROM Groups WHERE reference = ?", groupData.getReference())) {
if (resultSet == null) if (resultSet == null)
throw new DataException("Unable to fetch new group ID from repository"); throw new DataException("Unable to fetch new group ID from repository");
@ -318,7 +318,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
public void delete(int groupId) throws DataException { public void delete(int groupId) throws DataException {
try { try {
// Remove group // Remove group
this.repository.delete("`Groups`", "group_id = ?", groupId); this.repository.delete("Groups", "group_id = ?", groupId);
} catch (SQLException e) { } catch (SQLException e) {
throw new DataException("Unable to delete group info from repository", e); throw new DataException("Unable to delete group info from repository", e);
} }
@ -328,7 +328,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
public void delete(String groupName) throws DataException { public void delete(String groupName) throws DataException {
try { try {
// Remove group // Remove group
this.repository.delete("`Groups`", "group_name = ?", groupName); this.repository.delete("Groups", "group_name = ?", groupName);
} catch (SQLException e) { } catch (SQLException e) {
throw new DataException("Unable to delete group info from repository", e); throw new DataException("Unable to delete group info from repository", e);
} }
@ -338,7 +338,7 @@ public class HSQLDBGroupRepository implements GroupRepository {
@Override @Override
public String getOwner(int groupId) throws DataException { public String getOwner(int groupId) throws DataException {
try (ResultSet resultSet = this.repository.checkedExecute("SELECT owner FROM `Groups` WHERE group_id = ?", groupId)) { try (ResultSet resultSet = this.repository.checkedExecute("SELECT owner FROM Groups WHERE group_id = ?", groupId)) {
if (resultSet == null) if (resultSet == null)
return null; return null;

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` g on g.group_id = Transactions.tx_group_id " + "JOIN Groups on Groups.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 < ? - g.min_block_delay"); sql.append(" AND Transactions.block_height < ? - Groups.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` g on g.group_id = Transactions.tx_group_id " + "JOIN Groups on Groups.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 < ? - g.max_block_delay"); sql.append(" AND Transactions.block_height < ? - Groups.max_block_delay");
List<TransactionData> transactions = new ArrayList<>(); List<TransactionData> transactions = new ArrayList<>();