From e33405bf0561cf3ecced75a1717488ecd8df13a4 Mon Sep 17 00:00:00 2001 From: infiro Date: Wed, 4 Jul 2012 15:14:40 -0700 Subject: [PATCH] replaced execPreparedQuery with ExecutionItem --- src/bugzilla/BugzillaDb.java | 54 ++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/src/bugzilla/BugzillaDb.java b/src/bugzilla/BugzillaDb.java index 5e50d5a..19f1206 100644 --- a/src/bugzilla/BugzillaDb.java +++ b/src/bugzilla/BugzillaDb.java @@ -14,6 +14,8 @@ import comm.ComResources; import db.DbConnection; +import db.util.ISetter; +import db.util.PreparedStatementExecutionItem; public class BugzillaDb extends DbConnection { @@ -28,8 +30,13 @@ public List getIssues(int iLIMIT, int iOFFSET) { String sql = "SELECT * FROM bugzilla_bugs " + "ORDER BY bug_id " + "LIMIT " + iLIMIT + " OFFSET " + iOFFSET; - String[] parms = {}; - ResultSet rs = execPreparedQuery(sql, parms); + + ISetter[] params = {}; + PreparedStatementExecutionItem ei = new PreparedStatementExecutionItem(sql, params); + addExecutionItem(ei); + ei.waitUntilExecuted(); + ResultSet rs = ei.getResult(); + while(rs.next()) { issues.add(new Issue(-1, rs.getString("bug_status"), rs.getString("assigned_to"), @@ -51,8 +58,13 @@ public List getCCForIssue(Issue issue) { LinkedList people = new LinkedList(); String sql = "SELECT * FROM bugzilla_cc " + "WHERE bug_id=" + issue.getIssueNum(); - String[] parms = {}; - ResultSet rs = execPreparedQuery(sql, parms); + + ISetter[] params = {}; + PreparedStatementExecutionItem ei = new PreparedStatementExecutionItem(sql, params); + addExecutionItem(ei); + ei.waitUntilExecuted(); + ResultSet rs = ei.getResult(); + while(rs.next()) { people.add(new Person(-1, "", rs.getString("who"))); @@ -72,8 +84,11 @@ public List getItemsForIssue(Issue issue) { LinkedList items = new LinkedList(); String sql = "SELECT * FROM bugzilla_longdescs " + "WHERE bug_id=" + issue.getIssueNum(); - String[] parms = {}; - ResultSet rs = execPreparedQuery(sql, parms); + ISetter[] params = {}; + PreparedStatementExecutionItem ei = new PreparedStatementExecutionItem(sql, params); + addExecutionItem(ei); + ei.waitUntilExecuted(); + ResultSet rs = ei.getResult(); while(rs.next()) { items.add(new Item(rs.getString("who"), rs.getTimestamp("bug_when"), @@ -94,8 +109,13 @@ public List getAttachmentsForIssue(Issue issue) { LinkedList attachments = new LinkedList(); String sql = "SELECT * FROM bugzilla_attachments " + "WHERE bug_id=" + issue.getIssueNum(); - String[] parms = {}; - ResultSet rs = execPreparedQuery(sql, parms); + + ISetter[] params = {}; + PreparedStatementExecutionItem ei = new PreparedStatementExecutionItem(sql, params); + addExecutionItem(ei); + ei.waitUntilExecuted(); + ResultSet rs = ei.getResult(); + while(rs.next()) { attachments.add(new Attachment(issue.getItemID(), rs.getString("filename"), rs.getString("thedata"))); @@ -116,8 +136,13 @@ public List> getDependencies(int iLIMIT, int iOFFSET) { String sql = "SELECT * FROM bugzilla_dependencies " + "ORDER BY bug_id " + "LIMIT " + iLIMIT + " OFFSET " + iOFFSET; - String[] parms = {}; - ResultSet rs = execPreparedQuery(sql, parms); + + ISetter[] params = {}; + PreparedStatementExecutionItem ei = new PreparedStatementExecutionItem(sql, params); + addExecutionItem(ei); + ei.waitUntilExecuted(); + ResultSet rs = ei.getResult(); + while(rs.next()) { depends.add(new Pair(rs.getInt("blocked"), rs.getInt("dependson"))); @@ -138,8 +163,13 @@ public List> getDuplicates(int iLIMIT, int iOFFSET) { String sql = "SELECT * FROM bugzilla_duplicates " + "ORDER BY bug_id " + "LIMIT " + iLIMIT + " OFFSET " + iOFFSET; - String[] parms = {}; - ResultSet rs = execPreparedQuery(sql, parms); + + ISetter[] params = {}; + PreparedStatementExecutionItem ei = new PreparedStatementExecutionItem(sql, params); + addExecutionItem(ei); + ei.waitUntilExecuted(); + ResultSet rs = ei.getResult(); + while(rs.next()) { depends.add(new Pair(rs.getInt("dupe_of"), rs.getInt("dupe")));