From 4841c89b211b11fccbab4b83e0a1a235336f2114 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Thu, 19 Apr 2012 16:55:19 +0200 Subject: [PATCH] Use track creator to load tracks. --- .../demoscenemusic/data/DataManager.java | 29 +++------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java index 5523bbe..5d3c1de 100644 --- a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java +++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java @@ -82,39 +82,16 @@ public class DataManager { public Track trackById(String id) throws DatabaseException { Query query = new Query(Type.SELECT, "TRACKS"); query.addField(new Field("TRACKS.*")); - query.addField(new Field("TRACK_ARTISTS.*")); - query.addField(new Field("ARTISTS.*")); - query.addField(new Field("TRACK_STYLES.*")); - query.addField(new Field("STYLES.*")); - query.addJoin(new Join(JoinType.INNER, "TRACK_ARTISTS", new Field("TRACKS.ID"), new Field("TRACK_ARTISTS.TRACK"))); - query.addJoin(new Join(JoinType.INNER, "ARTISTS", new Field("TRACK_ARTISTS.ARTIST"), new Field("ARTISTS.ID"))); - query.addJoin(new Join(JoinType.INNER, "TRACK_STYLES", new Field("TRACKS.ID"), new Field("TRACK_STYLES.TRACK"))); - query.addJoin(new Join(JoinType.INNER, "STYLES", new Field("TRACK_STYLES.STYLE"), new Field("STYLES.ID"))); query.addWhereClause(new ValueFieldWhereClause(new ValueField("TRACKS.ID", new StringParameter(id)))); - query.addOrderField(new OrderField(new Field("TRACKS.ID"), Order.ASCENDING)); - query.addOrderField(new OrderField(new Field("TRACK_ARTISTS.DISPLAY_ORDER"), Order.ASCENDING)); - TrackLoader trackLoader = new TrackLoader(); - database.process(query, trackLoader); - return trackLoader.get(); + return database.getSingle(query, trackCreator); } public Collection getTracksByArtist(String artistId) throws DatabaseException { Query query = new Query(Type.SELECT, "TRACKS"); query.addField(new Field("TRACKS.*")); - query.addField(new Field("TRACK_ARTISTS.*")); - query.addField(new Field("ARTISTS.*")); - query.addField(new Field("TRACK_STYLES.*")); - query.addField(new Field("STYLES.*")); query.addJoin(new Join(JoinType.INNER, "TRACK_ARTISTS", new Field("TRACKS.ID"), new Field("TRACK_ARTISTS.TRACK"))); - query.addJoin(new Join(JoinType.INNER, "ARTISTS", new Field("TRACK_ARTISTS.ARTIST"), new Field("ARTISTS.ID"))); - query.addJoin(new Join(JoinType.INNER, "TRACK_STYLES", new Field("TRACKS.ID"), new Field("TRACK_STYLES.TRACK"))); - query.addJoin(new Join(JoinType.INNER, "STYLES", new Field("TRACK_STYLES.STYLE"), new Field("STYLES.ID"))); - query.addWhereClause(new ValueFieldWhereClause(new ValueField("ARTISTS.ID", new StringParameter(artistId)))); - query.addOrderField(new OrderField(new Field("TRACKS.ID"), Order.ASCENDING)); - query.addOrderField(new OrderField(new Field("TRACK_ARTISTS.DISPLAY_ORDER"), Order.ASCENDING)); - TrackLoader trackLoader = new TrackLoader(); - database.process(query, trackLoader); - return trackLoader.all(); + query.addWhereClause(new ValueFieldWhereClause(new ValueField("TRACK_ARTISTS.ARTIST", new StringParameter(artistId)))); + return database.getMultiple(query, trackCreator); } public Collection getGroupsByArtist(String artistId) throws DatabaseException { -- 2.7.4