From 35cc1b1314b9546c3cbc575c8f54198020398540 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Mon, 19 Oct 2009 00:15:11 +0100
Subject: [PATCH] fix mysql code for new stats options

---
 pyfpdb/GuiPlayerStats.py | 4 ++--
 pyfpdb/SQL.py            | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py
index 3946e629..7a474686 100644
--- a/pyfpdb/GuiPlayerStats.py
+++ b/pyfpdb/GuiPlayerStats.py
@@ -427,8 +427,8 @@ class GuiPlayerStats (threading.Thread):
         if holecards:  # re-use level variables for hole card query
             query = query.replace("<hgameTypeId>", "hp.startcards")
             query = query.replace("<orderbyhgameTypeId>"
-                                 , ",case when hp.startcards/13 >= mod(hp.startcards,13) then hp.startcards + 0.1 "
-                                   +    " else 13*mod(hp.startcards,13) + hp.startcards/13 "
+                                 , ",case when floor(hp.startcards/13) >= mod(hp.startcards,13) then hp.startcards + 0.1 "
+                                   +    " else 13*mod(hp.startcards,13) + floor(hp.startcards/13) "
                                    +    " end desc ")
         else:
             query = query.replace("<orderbyhgameTypeId>", "")
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 4b137e0c..251a56fa 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -1727,6 +1727,7 @@ class Sql:
             if db_server == 'mysql':
                 self.query['playerDetailedStats'] = """
                          select  <hgameTypeId>                                                          AS hgametypeid
+                                ,<playerName>                                                           AS pname
                                 ,gt.base
                                 ,gt.category
                                 ,upper(gt.limitType)                                                    AS limittype
@@ -1777,6 +1778,7 @@ class Sql:
                                inner join Hands h       on  (h.id = hp.handId)
                                inner join Gametypes gt  on  (gt.Id = h.gameTypeId)
                                inner join Sites s       on  (s.Id = gt.siteId)
+                               inner join Players p     on  (p.Id = hp.playerId)
                           where hp.playerId in <player_test>
                           /*and   hp.tourneysPlayersId IS NULL*/
                           and   h.seats <seats_test>
@@ -1784,14 +1786,15 @@ class Sql:
                           <gtbigBlind_test>
                           and   date_format(h.handStart, '%Y-%m-%d') <datestest>
                           group by hgameTypeId
-                                  ,hp.playerId
+                                  ,pname
                                   ,gt.base
                                   ,gt.category
                                   <groupbyseats>
                                   ,plposition
                                   ,upper(gt.limitType)
                                   ,s.name
-                          order by hp.playerId
+                          having 1 = 1 <havingclause>
+                          order by pname
                                   ,gt.base
                                   ,gt.category
                                   <orderbyseats>