removed TourneysPlayers.payinAmounts
This commit is contained in:
parent
6b417ebdd4
commit
d291b8621f
|
@ -403,7 +403,6 @@ tourneys_players_table = Table('TourneysPlayers', metadata,
|
|||
Column('id', BigIntColumn, primary_key=True),
|
||||
Column('tourneyId', Integer, ForeignKey("Tourneys.id"), nullable=False),
|
||||
Column('playerId', Integer, ForeignKey("Players.id"), nullable=False),
|
||||
Column('payinAmount', Integer), # INT NOT NULL
|
||||
Column('rank', Integer), # INT NOT NULL
|
||||
Column('winnings', Integer), # INT NOT NULL
|
||||
Column('winningsCurrency', Text), # TEXT
|
||||
|
|
|
@ -75,7 +75,7 @@ except ImportError:
|
|||
use_numpy = False
|
||||
|
||||
|
||||
DB_VERSION = 123
|
||||
DB_VERSION = 124
|
||||
|
||||
|
||||
# Variance created as sqlite has a bunch of undefined aggregate functions.
|
||||
|
|
|
@ -846,7 +846,6 @@ class Sql:
|
|||
id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
|
||||
tourneyId INT UNSIGNED NOT NULL, FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
|
||||
playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
|
||||
payinAmount INT NOT NULL,
|
||||
rank INT NOT NULL,
|
||||
winnings INT NOT NULL,
|
||||
winningsCurrency VARCHAR(4) NOT NULL,
|
||||
|
@ -861,7 +860,6 @@ class Sql:
|
|||
id BIGSERIAL, PRIMARY KEY (id),
|
||||
tourneyId INT, FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
|
||||
playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
|
||||
payinAmount INT,
|
||||
rank INT,
|
||||
winnings INT,
|
||||
winningsCurrency VARCHAR(4),
|
||||
|
@ -875,7 +873,6 @@ class Sql:
|
|||
id INT PRIMARY KEY,
|
||||
tourneyId INT,
|
||||
playerId INT,
|
||||
payinAmount INT,
|
||||
rank INT,
|
||||
winnings INT,
|
||||
winningsCurrency VARCHAR(4),
|
||||
|
@ -3658,7 +3655,6 @@ class Sql:
|
|||
"""
|
||||
|
||||
self.query['getTourneysPlayers'] = """SELECT id,
|
||||
payinAmount,
|
||||
rank,
|
||||
winnings,
|
||||
winningsCurrency,
|
||||
|
@ -3672,8 +3668,7 @@ class Sql:
|
|||
"""
|
||||
|
||||
self.query['updateTourneysPlayers'] = """UPDATE TourneysPlayers
|
||||
SET payinAmount = %s,
|
||||
rank = %s,
|
||||
SET rank = %s,
|
||||
winnings = %s,
|
||||
winningsCurrency = %s,
|
||||
rebuyCount = %s,
|
||||
|
@ -3685,8 +3680,8 @@ class Sql:
|
|||
"""
|
||||
|
||||
self.query['insertTourneysPlayers'] = """INSERT INTO TourneysPlayers
|
||||
(tourneyId, playerId, payinAmount, rank, winnings, winningsCurrency, rebuyCount, addOnCount, koCount, comment, commentTs)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
|
||||
(tourneyId, playerId, rank, winnings, winningsCurrency, rebuyCount, addOnCount, koCount, comment, commentTs)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
|
||||
"""
|
||||
|
||||
self.query['selectHandsPlayersWithWrongTTypeId'] = """SELECT id
|
||||
|
|
|
@ -89,7 +89,6 @@ class Tourney(object):
|
|||
self.finishPositions = {}
|
||||
self.winnings = {}
|
||||
self.winningsCurrency = {}
|
||||
self.payinAmounts = {}
|
||||
self.rebuyCounts = {}
|
||||
self.addOnCounts = {}
|
||||
self.koCounts = {}
|
||||
|
@ -137,7 +136,6 @@ class Tourney(object):
|
|||
|
||||
structs = ( ("GAMETYPE", self.gametype),
|
||||
("PLAYERS", self.players),
|
||||
("PAYIN AMOUNTS", self.payinAmounts),
|
||||
("POSITIONS", self.finishPositions),
|
||||
("WINNINGS", self.winnings),
|
||||
("COUNT REBUYS", self.rebuyCounts),
|
||||
|
@ -194,7 +192,7 @@ class Tourney(object):
|
|||
""" Function to create Tourney object from database """
|
||||
|
||||
|
||||
def addPlayer(self, rank, name, winnings, winningsCurrency, payinAmount, rebuyCount, addOnCount, koCount):
|
||||
def addPlayer(self, rank, name, winnings, winningsCurrency, rebuyCount, addOnCount, koCount):
|
||||
"""\
|
||||
Adds a player to the tourney, and initialises data structures indexed by player.
|
||||
rank (int) indicating the finishing rank (can be -1 if unknown)
|
||||
|
@ -206,7 +204,6 @@ winnings (decimal) the money the player ended the tourney with (can be 0, or
|
|||
self.finishPositions.update( { name : Decimal(rank) } )
|
||||
self.winnings.update( { name : Decimal(winnings) } )
|
||||
self.winningsCurrency.update( { name : winningsCurrency } )
|
||||
self.payinAmounts.update( {name : Decimal(payinAmount) } )
|
||||
self.rebuyCounts.update( {name: Decimal(rebuyCount) } )
|
||||
self.addOnCounts.update( {name: Decimal(addOnCount) } )
|
||||
self.koCounts.update( {name : Decimal(koCount) } )
|
||||
|
|
Loading…
Reference in New Issue
Block a user