remove unused queries
This commit is contained in:
sqlcoder
parent
a2db28ebf2
commit
cb323d2d63
|
|
@ -248,43 +248,6 @@ class FpdbSQLQueries:
|
||||||
self.query['createHandsTable'] = """ """
|
self.query['createHandsTable'] = """ """
|
||||||
|
|
||||||
|
|
||||||
################################
|
|
||||||
# Create Gametypes
|
|
||||||
################################
|
|
||||||
|
|
||||||
if(self.dbname == 'MySQL InnoDB'):
|
|
||||||
self.query['createBoardCardsTable'] = """CREATE TABLE BoardCards (
|
|
||||||
id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
|
|
||||||
handId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handId) REFERENCES Hands(id),
|
|
||||||
card1Value smallint NOT NULL,
|
|
||||||
card1Suit char(1) NOT NULL,
|
|
||||||
card2Value smallint NOT NULL,
|
|
||||||
card2Suit char(1) NOT NULL,
|
|
||||||
card3Value smallint NOT NULL,
|
|
||||||
card3Suit char(1) NOT NULL,
|
|
||||||
card4Value smallint NOT NULL,
|
|
||||||
card4Suit char(1) NOT NULL,
|
|
||||||
card5Value smallint NOT NULL,
|
|
||||||
card5Suit char(1) NOT NULL)
|
|
||||||
ENGINE=INNODB"""
|
|
||||||
elif(self.dbname == 'PostgreSQL'):
|
|
||||||
self.query['createBoardCardsTable'] = """CREATE TABLE BoardCards (
|
|
||||||
id BIGSERIAL, PRIMARY KEY (id),
|
|
||||||
handId BIGINT, FOREIGN KEY (handId) REFERENCES Hands(id),
|
|
||||||
card1Value smallint,
|
|
||||||
card1Suit char(1),
|
|
||||||
card2Value smallint,
|
|
||||||
card2Suit char(1),
|
|
||||||
card3Value smallint,
|
|
||||||
card3Suit char(1),
|
|
||||||
card4Value smallint,
|
|
||||||
card4Suit char(1),
|
|
||||||
card5Value smallint,
|
|
||||||
card5Suit char(1))"""
|
|
||||||
elif(self.dbname == 'SQLite'):
|
|
||||||
self.query['createBoardCardsTable'] = """ """
|
|
||||||
|
|
||||||
|
|
||||||
################################
|
################################
|
||||||
# Create TourneyTypes
|
# Create TourneyTypes
|
||||||
################################
|
################################
|
||||||
|
|
@ -1550,136 +1513,6 @@ class FpdbSQLQueries:
|
||||||
elif(self.dbname == 'SQLite'):
|
elif(self.dbname == 'SQLite'):
|
||||||
self.query['playerStatsByPosition'] = """ """
|
self.query['playerStatsByPosition'] = """ """
|
||||||
|
|
||||||
if(self.dbname == 'MySQL InnoDB'):
|
|
||||||
self.query['playerStatsByPositionAndHoleCards'] = """
|
|
||||||
SELECT
|
|
||||||
concat(upper(stats.limitType), ' '
|
|
||||||
,concat(upper(substring(stats.category,1,1)),substring(stats.category,2) ), ' '
|
|
||||||
,stats.name, ' $'
|
|
||||||
,cast(trim(leading ' ' from
|
|
||||||
case when stats.bigBlind < 100 then format(stats.bigBlind/100.0,2)
|
|
||||||
else format(stats.bigBlind/100.0,0)
|
|
||||||
end ) as char)
|
|
||||||
) AS Game
|
|
||||||
,case when stats.PlPosition = -2 then 'BB'
|
|
||||||
when stats.PlPosition = -1 then 'SB'
|
|
||||||
when stats.PlPosition = 0 then 'Btn'
|
|
||||||
when stats.PlPosition = 1 then 'CO'
|
|
||||||
when stats.PlPosition = 2 then 'MP'
|
|
||||||
when stats.PlPosition = 5 then 'EP'
|
|
||||||
else '??'
|
|
||||||
end AS PlPosition
|
|
||||||
/*,stats.n*/,hprof2.n
|
|
||||||
/*,stats.vpip*/,0
|
|
||||||
/*,stats.pfr*/,0
|
|
||||||
/*,stats.saw_f*/,0
|
|
||||||
/*,stats.sawsd*/,0
|
|
||||||
/*,stats.wtsdwsf*/,0
|
|
||||||
/*,stats.wmsd*/,0
|
|
||||||
/*,stats.FlAFq*/,0
|
|
||||||
/*,stats.TuAFq*/,0
|
|
||||||
/*,stats.RvAFq*/,0
|
|
||||||
/*,stats.PoFAFq*/,0
|
|
||||||
/* if you have handsactions data the next 3 fields should give same answer as
|
|
||||||
following 3 commented out fields */
|
|
||||||
/*,stats.Net
|
|
||||||
,stats.BBper100
|
|
||||||
,stats.Profitperhand*/
|
|
||||||
,format(hprof2.sum_profit/100.0,2) AS Net
|
|
||||||
/*,format((hprof2.sum_profit/(stats.bigBlind+0.0)) / (stats.n/100.0),2)*/,0
|
|
||||||
AS BBlPer100
|
|
||||||
,hprof2.profitperhand AS Profitperhand
|
|
||||||
,format(hprof2.variance,2) AS Variance
|
|
||||||
FROM
|
|
||||||
(select /* stats from hudcache */
|
|
||||||
gt.base
|
|
||||||
,gt.category
|
|
||||||
,upper(gt.limitType) as limitType
|
|
||||||
,s.name
|
|
||||||
,gt.bigBlind
|
|
||||||
,hc.gametypeId
|
|
||||||
,case when hc.position = 'B' then -2
|
|
||||||
when hc.position = 'S' then -1
|
|
||||||
when hc.position = 'D' then 0
|
|
||||||
when hc.position = 'C' then 1
|
|
||||||
when hc.position = 'M' then 2
|
|
||||||
when hc.position = 'E' then 5
|
|
||||||
else 9
|
|
||||||
end as PlPosition
|
|
||||||
,sum(HDs) AS n
|
|
||||||
,format(100.0*sum(street0VPI)/sum(HDs),1) AS vpip
|
|
||||||
,format(100.0*sum(street0Aggr)/sum(HDs),1) AS pfr
|
|
||||||
,format(100.0*sum(street1Seen)/sum(HDs),1) AS saw_f
|
|
||||||
,format(100.0*sum(sawShowdown)/sum(HDs),1) AS sawsd
|
|
||||||
,case when sum(street1Seen) = 0 then '-'
|
|
||||||
else format(100.0*sum(sawShowdown)/sum(street1Seen),1)
|
|
||||||
end AS wtsdwsf
|
|
||||||
,case when sum(sawShowdown) = 0 then '-'
|
|
||||||
end AS wtsdwsf
|
|
||||||
,case when sum(sawShowdown) = 0 then '-'
|
|
||||||
else format(100.0*sum(wonAtSD)/sum(sawShowdown),1)
|
|
||||||
end AS wmsd
|
|
||||||
,case when sum(street1Seen) = 0 then '-'
|
|
||||||
else format(100.0*sum(street1Aggr)/sum(street1Seen),1)
|
|
||||||
end AS FlAFq
|
|
||||||
,case when sum(street2Seen) = 0 then '-'
|
|
||||||
else format(100.0*sum(street2Aggr)/sum(street2Seen),1)
|
|
||||||
end AS TuAFq
|
|
||||||
,case when sum(street3Seen) = 0 then '-'
|
|
||||||
else format(100.0*sum(street3Aggr)/sum(street3Seen),1)
|
|
||||||
end AS RvAFq
|
|
||||||
,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then '-'
|
|
||||||
else format(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
|
|
||||||
/(sum(street1Seen)+sum(street2Seen)+sum(street3Seen)),1)
|
|
||||||
end AS PoFAFq
|
|
||||||
,format(sum(totalProfit)/100.0,2) AS Net
|
|
||||||
,format((sum(totalProfit)/(gt.bigBlind+0.0)) / (sum(HDs)/100.0),2)
|
|
||||||
AS BBper100
|
|
||||||
,format( (sum(totalProfit)/100.0) / sum(HDs), 4) AS Profitperhand
|
|
||||||
from Gametypes gt
|
|
||||||
inner join Sites s on s.Id = gt.siteId
|
|
||||||
inner join HudCache hc on hc.gameTypeId = gt.Id
|
|
||||||
where hc.playerId in <player_test>
|
|
||||||
# use <gametype_test> here ?
|
|
||||||
group by gt.base
|
|
||||||
,gt.category
|
|
||||||
,upper(gt.limitType)
|
|
||||||
,s.name
|
|
||||||
,gt.bigBlind
|
|
||||||
,hc.gametypeId
|
|
||||||
,PlPosition
|
|
||||||
) stats
|
|
||||||
inner join
|
|
||||||
( select # profit from handsplayers/handsactions
|
|
||||||
hprof.gameTypeId,
|
|
||||||
case when hprof.position = 'B' then -2
|
|
||||||
when hprof.position = 'S' then -1
|
|
||||||
when hprof.position in ('3','4') then 2
|
|
||||||
when hprof.position in ('6','7') then 5
|
|
||||||
else hprof.position
|
|
||||||
end as PlPosition,
|
|
||||||
sum(hprof.profit) as sum_profit,
|
|
||||||
avg(hprof.profit/100.0) as profitperhand,
|
|
||||||
variance(hprof.profit/100.0) as variance,
|
|
||||||
count(*) as n
|
|
||||||
from
|
|
||||||
(select hp.handId, h.gameTypeId, hp.position, hp.winnings, SUM(ha.amount) as costs
|
|
||||||
, hp.winnings - SUM(ha.amount) as profit
|
|
||||||
from HandsPlayers hp
|
|
||||||
inner join Hands h ON h.id = hp.handId
|
|
||||||
left join HandsActions ha ON ha.handsPlayerId = hp.id
|
|
||||||
where hp.playerId in <player_test>
|
|
||||||
# use <gametype_test> here ?
|
|
||||||
and hp.tourneysPlayersId IS NULL
|
|
||||||
and ((hp.card1Value = <first_card> and hp.card2Value = <second_card>) or (hp.card1Value = <second_card> and hp.card2Value = <first_card>))
|
|
||||||
group by hp.handId, h.gameTypeId, hp.position, hp.winnings
|
|
||||||
) hprof
|
|
||||||
group by hprof.gameTypeId, PlPosition
|
|
||||||
) hprof2
|
|
||||||
on ( hprof2.gameTypeId = stats.gameTypeId
|
|
||||||
and hprof2.PlPosition = stats.PlPosition)
|
|
||||||
order by stats.category, stats.limittype, stats.bigBlind, cast(stats.PlPosition as signed)
|
|
||||||
"""
|
|
||||||
if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL') or (self.dbname == 'SQLite'):
|
if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL') or (self.dbname == 'SQLite'):
|
||||||
self.query['getGames'] = """SELECT DISTINCT category from Gametypes"""
|
self.query['getGames'] = """SELECT DISTINCT category from Gametypes"""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -243,7 +243,6 @@ class fpdb_db:
|
||||||
self.cursor.execute(self.sql.query['createPlayersTable'])
|
self.cursor.execute(self.sql.query['createPlayersTable'])
|
||||||
self.cursor.execute(self.sql.query['createAutoratesTable'])
|
self.cursor.execute(self.sql.query['createAutoratesTable'])
|
||||||
self.cursor.execute(self.sql.query['createHandsTable'])
|
self.cursor.execute(self.sql.query['createHandsTable'])
|
||||||
self.cursor.execute(self.sql.query['createBoardCardsTable'])
|
|
||||||
self.cursor.execute(self.sql.query['createTourneyTypesTable'])
|
self.cursor.execute(self.sql.query['createTourneyTypesTable'])
|
||||||
self.cursor.execute(self.sql.query['createTourneysTable'])
|
self.cursor.execute(self.sql.query['createTourneysTable'])
|
||||||
self.cursor.execute(self.sql.query['createTourneysPlayersTable'])
|
self.cursor.execute(self.sql.query['createTourneysPlayersTable'])
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user