From 659f0bb508aefd11f29a90a75b49101b6defb4fc Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Fri, 19 Dec 2008 17:27:18 +0900
Subject: [PATCH] Grapher: Fix Postgres to work again

---
 pyfpdb/FpdbSQLQueries.py | 6 ++++--
 pyfpdb/GuiGraphViewer.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyfpdb/FpdbSQLQueries.py b/pyfpdb/FpdbSQLQueries.py
index 4df2fa75..fe170c8c 100644
--- a/pyfpdb/FpdbSQLQueries.py
+++ b/pyfpdb/FpdbSQLQueries.py
@@ -663,8 +663,10 @@ class FpdbSQLQueries:
                 INNER JOIN Players pl      ON hp.playerId     = pl.id
                 INNER JOIN Hands h         ON h.id            = hp.handId
                 INNER JOIN HandsActions ha ON ha.handPlayerId = hp.id
-                WHERE pl.name   = %s
-                AND   pl.siteId = %s
+                where pl.id in <player_test>
+                AND   pl.siteId in <site_test>
+                AND   h.handStart > '<startdate_test>'
+                AND   h.handStart < '<enddate_test>'
                 AND   hp.tourneysPlayersId IS NULL
                 GROUP BY hp.handId, hp.winnings, h.handStart
                 ORDER BY h.handStart"""
diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py
index ae8895ff..8026a2c7 100644
--- a/pyfpdb/GuiGraphViewer.py
+++ b/pyfpdb/GuiGraphViewer.py
@@ -195,7 +195,7 @@ class GuiGraphViewer (threading.Thread):
             hbox.show()
             self.createSiteLine(hbox, site)
             #Get db site id for filtering later
-            self.cursor.execute(self.sql.query['getSiteId'], (site))
+            self.cursor.execute(self.sql.query['getSiteId'], (site,))
             result = self.db.cursor.fetchall()
             if len(result) == 1:
                 self.siteid[site] = result[0][0]