From 49ce7de25415f4e5d7fdeaca342484ee61eb1536 Mon Sep 17 00:00:00 2001 From: PassThePeas Date: Mon, 7 Sep 2009 00:18:10 +0200 Subject: [PATCH] Patch for HandsPlayers.TourneyTypeId not being null (even in ring context) for hudcache / Extend tourneyName size in TourneysTable --- pyfpdb/Database.py | 6 +++--- pyfpdb/SQL.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 47ae282e..02049337 100755 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -1282,7 +1282,7 @@ class Database: raise fpdb_simple.FpdbError("invalid category") inserts.append( ( - hands_id, player_ids[i], start_cashes[i], positions[i], + hands_id, player_ids[i], start_cashes[i], positions[i], 1, # tourneytypeid - needed for hudcache card1, card2, card3, card4, startCards, winnings[i], rakes[i], seatNos[i], hudCache['totalProfit'][i], hudCache['street0VPI'][i], hudCache['street0Aggr'][i], @@ -1313,7 +1313,7 @@ class Database: c = self.get_cursor() c.executemany (""" INSERT INTO HandsPlayers - (handId, playerId, startCash, position, + (handId, playerId, startCash, position, tourneyTypeId, card1, card2, card3, card4, startCards, winnings, rake, seatNo, totalProfit, street0VPI, street0Aggr, street0_3BChance, street0_3BDone, street1Seen, street2Seen, street3Seen, street4Seen, sawShowdown, @@ -1334,7 +1334,7 @@ class Database: VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, - %s, %s, %s, %s, %s, %s, %s, %s, %s)""".replace('%s', self.sql.query['placeholder']) + %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)""".replace('%s', self.sql.query['placeholder']) ,inserts ) result.append( self.get_last_insert_id(c) ) # wrong? not used currently except: diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py index 5f314517..b66b7134 100644 --- a/pyfpdb/SQL.py +++ b/pyfpdb/SQL.py @@ -377,7 +377,7 @@ class Sql: startTime DATETIME NOT NULL, endTime DATETIME, buyinChips INT, - tourneyName varchar(20), + tourneyName varchar(40), matrixIdProcessed TINYINT UNSIGNED DEFAULT 0, /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */ rebuyChips INT DEFAULT 0, addonChips INT DEFAULT 0, @@ -399,7 +399,7 @@ class Sql: startTime timestamp without time zone, endTime timestamp without time zone, buyinChips INT, - tourneyName varchar(20), + tourneyName varchar(40), matrixIdProcessed SMALLINT UNSIGNED DEFAULT 0, /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */ rebuyChips INT DEFAULT 0, addonChips INT DEFAULT 0,