Code change must be reviewed!

The Handplayers and Hands both have a street(x)Raises index added to the
query result. I'm not sure this solution works.
This commit is contained in:
Gerko de Roo 2010-06-11 20:35:34 +02:00
parent d9f6967c1c
commit 1c238e4119

View File

@ -819,7 +819,6 @@ class Sql:
street2Raises INT, street2Raises INT,
street3Raises INT, street3Raises INT,
street4Raises INT, street4Raises INT,
actionString REAL) actionString REAL)
""" """
@ -2844,6 +2843,11 @@ class Sql:
,street2Bets ,street2Bets
,street3Bets ,street3Bets
,street4Bets ,street4Bets
,street0Raises
,street1Raises
,street2Raises
,street3Raises
,street4Raises
) )
SELECT h.gametypeId SELECT h.gametypeId
,hp.playerId ,hp.playerId
@ -2929,6 +2933,11 @@ class Sql:
,sum(street2Bets) ,sum(street2Bets)
,sum(street3Bets) ,sum(street3Bets)
,sum(street4Bets) ,sum(street4Bets)
,sum(hp.street0Raises)
,sum(hp.street1Raises)
,sum(hp.street2Raises)
,sum(hp.street3Raises)
,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)
<where_clause> <where_clause>
@ -3013,6 +3022,11 @@ class Sql:
,street2Bets ,street2Bets
,street3Bets ,street3Bets
,street4Bets ,street4Bets
,street0Raises
,street1Raises
,street2Raises
,street3Raises
,street4Raises
) )
SELECT h.gametypeId SELECT h.gametypeId
,hp.playerId ,hp.playerId
@ -3098,6 +3112,11 @@ class Sql:
,sum(CAST(street2Bets as integer)) ,sum(CAST(street2Bets as integer))
,sum(CAST(street3Bets as integer)) ,sum(CAST(street3Bets as integer))
,sum(CAST(street4Bets as integer)) ,sum(CAST(street4Bets as integer))
,sum(CAST(hp.street0Raises as integer))
,sum(CAST(hp.street1Raises as integer))
,sum(CAST(hp.street2Raises as integer))
,sum(CAST(hp.street3Raises 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)
<where_clause> <where_clause>
@ -3182,6 +3201,11 @@ class Sql:
,street2Bets ,street2Bets
,street3Bets ,street3Bets
,street4Bets ,street4Bets
,street0Raises
,street1Raises
,street2Raises
,street3Raises
,street4Raises
) )
SELECT h.gametypeId SELECT h.gametypeId
,hp.playerId ,hp.playerId
@ -3267,6 +3291,11 @@ class Sql:
,sum(CAST(street2Bets as integer)) ,sum(CAST(street2Bets as integer))
,sum(CAST(street3Bets as integer)) ,sum(CAST(street3Bets as integer))
,sum(CAST(street4Bets as integer)) ,sum(CAST(street4Bets as integer))
,sum(CAST(hp.street0Raises as integer))
,sum(CAST(hp.street1Raises as integer))
,sum(CAST(hp.street2Raises as integer))
,sum(CAST(hp.street3Raises 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)
<where_clause> <where_clause>