evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.assembla.com/fpdboz

Browse Source
This commit is contained in:
Mika Bostrom 2009-11-02 19:07:10 +02:00
commit 27d5ea6e6a
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyfpdb/GuiSessionViewer.py
View File

@ -248,6 +248,8 @@ class GuiSessionViewer (threading.Thread):
nametest = nametest.replace("L", "")
nametest = nametest.replace(",)",")")
q = q.replace("<player_test>", nametest)
q = q.replace("<ampersand_s>", "%s")
self.db.cursor.execute(q)
THRESHOLD = 1800
hands = self.db.cursor.fetchall()

19
pyfpdb/SQL.py
View File

@ -1895,9 +1895,9 @@ class Sql:
self.query['playerDetailedStats'] = """
select <hgameTypeId> AS hgametypeid
,gt.base
,gt.category
,gt.category AS category
,upper(gt.limitType) AS limittype
,s.name
,s.name AS name
,min(gt.bigBlind) AS minbigblind
,max(gt.bigBlind) AS maxbigblind
/*,<hcgametypeId> AS gtid*/
@ -1939,7 +1939,8 @@ class Sql:
,100.0*avg((hp.totalProfit+hp.rake)/(gt.bigBlind+0.0)) AS bb100xr
,avg((hp.totalProfit+hp.rake)/100.0) AS profhndxr
,avg(h.seats+0.0) AS avgseats
,variance(hp.totalProfit/100.0) AS variance
/*,variance(hp.totalProfit/100.0) AS variance*/
,0.0 AS variance
from HandsPlayers hp
inner join Hands h on (h.id = hp.handId)
inner join Gametypes gt on (gt.Id = h.gameTypeId)
@ -2501,7 +2502,17 @@ class Sql:
AND h.handStart <datestest>
ORDER by time"""
elif db_server == 'sqlite':
self.query['sessionStats'] = """ """
self.query['sessionStats'] = """
SELECT STRFTIME('<ampersand_s>', h.handStart) as time, hp.handId, hp.startCash, hp.winnings, hp.totalProfit
FROM HandsPlayers hp
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 h.handStart <datestest>
ORDER by time"""
####################################
# Queries to rebuild/modify hudcache