From bf3f78e71845ed99d68c6118c1f2c4f685fdb90a Mon Sep 17 00:00:00 2001 From: catbref Date: Tue, 5 Mar 2019 11:12:00 +0000 Subject: [PATCH] Add AssetOrders is_closed fix-up to DB updates + minor --- src/main/java/org/qora/data/asset/RecentTradeData.java | 1 - .../java/org/qora/repository/hsqldb/HSQLDBAssetRepository.java | 2 +- .../java/org/qora/repository/hsqldb/HSQLDBDatabaseUpdates.java | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/qora/data/asset/RecentTradeData.java b/src/main/java/org/qora/data/asset/RecentTradeData.java index 41031e69..e1295c61 100644 --- a/src/main/java/org/qora/data/asset/RecentTradeData.java +++ b/src/main/java/org/qora/data/asset/RecentTradeData.java @@ -4,7 +4,6 @@ import java.math.BigDecimal; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBAssetRepository.java b/src/main/java/org/qora/repository/hsqldb/HSQLDBAssetRepository.java index 0659ca03..3c618c35 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBAssetRepository.java +++ b/src/main/java/org/qora/repository/hsqldb/HSQLDBAssetRepository.java @@ -86,7 +86,7 @@ public class HSQLDBAssetRepository implements AssetRepository { @Override public List getAllAssets(Integer limit, Integer offset, Boolean reverse) throws DataException { - String sql = "SELECT owner, asset_id, description, quantity, is_divisible, reference, asset_name FROM Assets ORDER BY asset_name"; + String sql = "SELECT owner, asset_id, description, quantity, is_divisible, reference, asset_name FROM Assets ORDER BY asset_id"; if (reverse != null && reverse) sql += " DESC"; sql += HSQLDBRepository.limitOffsetSql(limit, offset); diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBDatabaseUpdates.java b/src/main/java/org/qora/repository/hsqldb/HSQLDBDatabaseUpdates.java index 6338d536..83c342fe 100644 --- a/src/main/java/org/qora/repository/hsqldb/HSQLDBDatabaseUpdates.java +++ b/src/main/java/org/qora/repository/hsqldb/HSQLDBDatabaseUpdates.java @@ -588,6 +588,8 @@ public class HSQLDBDatabaseUpdates { case 37: // Performance-improving INDEX stmt.execute("CREATE INDEX IF NOT EXISTS BlockGenerationHeightIndex ON Blocks (generation, height)"); + // Asset orders now have isClosed=true when isFulfilled=true + stmt.execute("UPDATE AssetOrders SET is_closed = TRUE WHERE is_fulfilled = TRUE"); break; default: