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

log4j2.properties

@@ -23,8 +23,12 @@ logger.jerseyInject.level = error
 # 2019-02-14 11:46:27 INFO  AbstractConnector:289 - Started ServerConnector@50ad322b{HTTP/1.1,[http/1.1]}{0.0.0.0:9085}
 # 2019-02-14 11:46:27 INFO  Server:374 - jetty-9.4.11.v20180605; built: 2018-06-05T18:24:03.829Z; git: d5fc0523cfa96bfebfbda19606cad384d772f04c; jvm 1.8.0_181-b13
 # 2019-02-14 11:46:27 INFO  Server:411 - Started @2539ms
-logger.oejsSCH.name = org.eclipse.jetty
-logger.oejsSCH.level = warn
+logger.jetty.name = org.eclipse.jetty
+logger.jetty.level = warn
+# Even more extraneous Jetty output
+# 2019-01-26 02:18:10 WARN  ResourceService:718 - java.util.concurrent.TimeoutException: Idle timeout expired: 30000/30000 ms
+logger.jettyRS.name = org.eclipse.jetty.server.ResourceService
+logger.jettyRS.level = error
 
 # Suppress extraneous slf4j entries
 # 2019-02-14 11:46:27 INFO  log:193 - Logging initialized @1636ms to org.eclipse.jetty.util.log.Slf4jLog

src/main/java/org/qora/repository/hsqldb/HSQLDBAssetRepository.java

@@ -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";

src/main/java/org/qora/repository/hsqldb/HSQLDBDatabaseUpdates.java

@@ -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