Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-23 04:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GET /assets/trades/recent regression + silence Jetty timeout warnings

Browse Source
This commit is contained in:
catbref
2019-03-17 13:35:24 +00:00
parent 76277ae9c3
commit 91ee505ba9
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qora/repository/hsqldb/HSQLDBAssetRepository.java
View File

@@ -426,7 +426,7 @@ public class HSQLDBAssetRepository implements AssetRepository {
tradedAssetsSubquery += " GROUP BY have_asset_id, want_asset_id";
// Find recent trades using "TradedAssets" assetID pairs
String recentTradesSubquery = "SELECT AssetTrades.amount, AssetTrades.price, AssetTrades.traded "
String recentTradesSubquery = "SELECT AssetTrades.target_amount, AssetTrades.initiator_amount, AssetTrades.traded "
+ "FROM AssetOrders JOIN AssetTrades ON initiating_order_id = asset_order_id "
+ "WHERE AssetOrders.have_asset_id = TradedAssets.have_asset_id AND AssetOrders.want_asset_id = TradedAssets.want_asset_id "
+ "ORDER BY traded DESC LIMIT 2";

2
src/main/java/org/qora/repository/hsqldb/HSQLDBDatabaseUpdates.java
View File

@@ -628,7 +628,7 @@ public class HSQLDBDatabaseUpdates {
stmt.execute("ALTER TABLE Assets ALTER COLUMN data AssetDataLob");
stmt.execute("ALTER TABLE IssueAssetTransactions ALTER COLUMN data AssetDataLob");
stmt.execute("ALTER TABLE UpdateAssetTransactions ALTER COLUMN new_data AssetDataLob");
break;
break;
default:
// nothing to do