From 1c238e411996ff053e74a87bd9716a531ccc348c Mon Sep 17 00:00:00 2001
From: Gerko de Roo <gerko.deroo@smurfette.nl>
Date: Fri, 11 Jun 2010 20:35:34 +0200
Subject: [PATCH] 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.

---
 pyfpdb/SQL.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index d54ba9db..94d7a21e 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -819,7 +819,6 @@ class Sql:
                         street2Raises INT,
                         street3Raises INT,
                         street4Raises INT,
-
                         actionString REAL)
                         """
 
@@ -2844,6 +2843,11 @@ class Sql:
                 ,street2Bets
                 ,street3Bets
                 ,street4Bets
+                ,street0Raises
+                ,street1Raises
+                ,street2Raises
+                ,street3Raises
+                ,street4Raises
                 )
                 SELECT h.gametypeId
                       ,hp.playerId
@@ -2929,6 +2933,11 @@ class Sql:
                       ,sum(street2Bets)
                       ,sum(street3Bets)
                       ,sum(street4Bets)
+                      ,sum(hp.street0Raises)
+                      ,sum(hp.street1Raises)
+                      ,sum(hp.street2Raises)
+                      ,sum(hp.street3Raises)
+                      ,sum(hp.street4Raises)
                 FROM HandsPlayers hp
                 INNER JOIN Hands h ON (h.id = hp.handId)
                 <where_clause>
@@ -3013,6 +3022,11 @@ class Sql:
                 ,street2Bets
                 ,street3Bets
                 ,street4Bets
+                ,street0Raises
+                ,street1Raises
+                ,street2Raises
+                ,street3Raises
+                ,street4Raises
                 )
                 SELECT h.gametypeId
                       ,hp.playerId
@@ -3098,6 +3112,11 @@ class Sql:
                       ,sum(CAST(street2Bets as integer))
                       ,sum(CAST(street3Bets 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
                 INNER JOIN Hands h ON (h.id = hp.handId)
                 <where_clause>
@@ -3182,6 +3201,11 @@ class Sql:
                 ,street2Bets
                 ,street3Bets
                 ,street4Bets
+                ,street0Raises
+                ,street1Raises
+                ,street2Raises
+                ,street3Raises
+                ,street4Raises
                 )
                 SELECT h.gametypeId
                       ,hp.playerId
@@ -3267,6 +3291,11 @@ class Sql:
                       ,sum(CAST(street2Bets as integer))
                       ,sum(CAST(street3Bets 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
                 INNER JOIN Hands h ON (h.id = hp.handId)
                 <where_clause>