Merge branch 'master' of git://git.assembla.com/fpdb-sql
This commit is contained in:
commit
9944f8ac1b
|
@ -1012,7 +1012,9 @@ class Database:
|
|||
if self.backend == self.SQLITE:
|
||||
c.execute("INSERT INTO TourneyTypes (id, siteId, buyin, fee) VALUES (NULL, 1, 0, 0);")
|
||||
else:
|
||||
c.execute("insert into TourneyTypes values (0,1,0,0,0,0,0,null,0,0,0);")
|
||||
c.execute("""insert into TourneyTypes(id, siteId, buyin, fee, maxSeats, knockout
|
||||
,rebuyOrAddon, speed, headsUp, shootout, matrix)
|
||||
values (1, 1, 0, 0, 0, False, False, null, False, False, False);""")
|
||||
|
||||
#end def fillDefaultData
|
||||
|
||||
|
|
|
@ -473,7 +473,9 @@ class Flop_Mucked(Aux_Seats):
|
|||
self.displayed = True
|
||||
if i != "common":
|
||||
id = self.get_id_from_seat(i)
|
||||
self.m_windows[i].eb.set_tooltip_text(self.hud.stat_dict[id]['screen_name'])
|
||||
# sc: had KeyError here with new table so added id != None test as a guess:
|
||||
if id != None:
|
||||
self.m_windows[i].eb.set_tooltip_text(self.hud.stat_dict[id]['screen_name'])
|
||||
|
||||
def update_gui(self, new_hand_id):
|
||||
"""Prepare and show the mucked cards."""
|
||||
|
|
|
@ -400,7 +400,7 @@ class Sql:
|
|||
endTime timestamp without time zone,
|
||||
buyinChips INT,
|
||||
tourneyName varchar(40),
|
||||
matrixIdProcessed SMALLINT UNSIGNED DEFAULT 0, /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */
|
||||
matrixIdProcessed SMALLINT DEFAULT 0, /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */
|
||||
rebuyChips INT DEFAULT 0,
|
||||
addonChips INT DEFAULT 0,
|
||||
rebuyAmount INT DEFAULT 0,
|
||||
|
|
Loading…
Reference in New Issue
Block a user