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

This makes HUD Cache work again but without tourneytypeid - one of these lines breaks it

Browse Source
This commit is contained in:
steffen123 2010-08-10 01:27:25 +02:00
parent 4fbb26b4fa
commit c5acd04bb6
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pyfpdb/SQL.py
View File

@ -2988,7 +2988,6 @@ class Sql:
,playerId ,playerId
,activeSeats ,activeSeats
,position ,position
,tourneyTypeId
,styleKey ,styleKey
,HDs ,HDs
,wonWhenSeenStreet1 ,wonWhenSeenStreet1
@ -3078,7 +3077,6 @@ class Sql:
when hp.position = '9' then 'E' when hp.position = '9' then 'E'
else 'E' else 'E'
end AS hc_position end AS hc_position
,t.tourneyTypeId
,date_format(h.startTime, 'd%y%m%d') ,date_format(h.startTime, 'd%y%m%d')
,count(1) ,count(1)
,sum(wonWhenSeenStreet1) ,sum(wonWhenSeenStreet1)
@ -3152,14 +3150,11 @@ class Sql:
,sum(hp.street4Raises) ,sum(hp.street4Raises)
FROM HandsPlayers hp FROM HandsPlayers hp
INNER JOIN Hands h ON (h.id = hp.handId) INNER JOIN Hands h ON (h.id = hp.handId)
INNER JOIN TourneysPlayers tp ON (tp.id = hp.tourneysPlayersId)
INNER JOIN Tourneys t ON (t.id = tp.tourneyId)
<where_clause> <where_clause>
GROUP BY h.gametypeId GROUP BY h.gametypeId
,hp.playerId ,hp.playerId
,h.seats ,h.seats
,hc_position ,hc_position
,t.tourneyTypeId
,date_format(h.startTime, 'd%y%m%d') ,date_format(h.startTime, 'd%y%m%d')
""" """
elif db_server == 'postgresql': elif db_server == 'postgresql':
@ -3169,7 +3164,6 @@ class Sql:
,playerId ,playerId
,activeSeats ,activeSeats
,position ,position
,tourneyTypeId
,styleKey ,styleKey
,HDs ,HDs
,wonWhenSeenStreet1 ,wonWhenSeenStreet1
@ -3259,7 +3253,6 @@ class Sql:
when hp.position = '9' then 'E' when hp.position = '9' then 'E'
else 'E' else 'E'
end AS hc_position end AS hc_position
,t.tourneyTypeId
,'d' || to_char(h.startTime, 'YYMMDD') ,'d' || to_char(h.startTime, 'YYMMDD')
,count(1) ,count(1)
,sum(wonWhenSeenStreet1) ,sum(wonWhenSeenStreet1)
@ -3333,14 +3326,11 @@ class Sql:
,sum(CAST(hp.street4Raises as integer)) ,sum(CAST(hp.street4Raises as integer))
FROM HandsPlayers hp FROM HandsPlayers hp
INNER JOIN Hands h ON (h.id = hp.handId) INNER JOIN Hands h ON (h.id = hp.handId)
INNER JOIN TourneysPlayers tp ON (tp.id = hp.tourneysPlayersId)
INNER JOIN Tourneys t ON (t.id = tp.tourneyId)
<where_clause> <where_clause>
GROUP BY h.gametypeId GROUP BY h.gametypeId
,hp.playerId ,hp.playerId
,h.seats ,h.seats
,hc_position ,hc_position
,t.tourneyTypeId
,to_char(h.startTime, 'YYMMDD') ,to_char(h.startTime, 'YYMMDD')
""" """
else: # assume sqlite else: # assume sqlite
@ -3350,7 +3340,6 @@ class Sql:
,playerId ,playerId
,activeSeats ,activeSeats
,position ,position
,tourneyTypeId
,styleKey ,styleKey
,HDs ,HDs
,wonWhenSeenStreet1 ,wonWhenSeenStreet1
@ -3440,7 +3429,6 @@ class Sql:
when hp.position = '9' then 'E' when hp.position = '9' then 'E'
else 'E' else 'E'
end AS hc_position end AS hc_position
,t.tourneyTypeId
,'d' || substr(strftime('%Y%m%d', h.startTime),3,7) ,'d' || substr(strftime('%Y%m%d', h.startTime),3,7)
,count(1) ,count(1)
,sum(wonWhenSeenStreet1) ,sum(wonWhenSeenStreet1)
@ -3514,14 +3502,11 @@ class Sql:
,sum(CAST(hp.street4Raises as integer)) ,sum(CAST(hp.street4Raises as integer))
FROM HandsPlayers hp FROM HandsPlayers hp
INNER JOIN Hands h ON (h.id = hp.handId) INNER JOIN Hands h ON (h.id = hp.handId)
INNER JOIN TourneysPlayers tp ON (tp.id = hp.tourneysPlayersId)
INNER JOIN Tourneys t ON (t.id = tp.tourneyId)
<where_clause> <where_clause>
GROUP BY h.gametypeId GROUP BY h.gametypeId
,hp.playerId ,hp.playerId
,h.seats ,h.seats
,hc_position ,hc_position
,t.tourneyTypeId
,'d' || substr(strftime('%Y%m%d', h.startTime),3,7) ,'d' || substr(strftime('%Y%m%d', h.startTime),3,7)
""" """