evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
f6b97ab532
fpdb/pyfpdb/SQL.py

4384 lines
247 KiB
Python
Raw Normal View History

change calls to python2 back to python
2010-07-08 20:01:03 +02:00
#!/usr/bin/env python
moved currency field from Sites to Gametypes&TourneyTypes, addded Sites.code
2010-06-20 17:34:58 +02:00
# -*- coding: utf-8 -*-
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git Conflicts: pyfpdb/HandHistoryConverter.py pyfpdb/SQL.py
2009-08-12 11:26:42 +02:00
"""Returns a dict of SQL statements used in fpdb.
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
"""
some cleanups: - updated copyright notices - added copyright notices that were missing - changed python to python2 - added gpl-2/3 license texts - removed THANKS.txt file as the wiki version is more up to date - removed empty fpdb_db.py - added GPL2 to debian license file
2010-07-04 03:05:16 +02:00
# Copyright 2008-2010, Ray E. Barker
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# NOTES: The sql statements use the placeholder %s for bind variables
# which is then replaced by ? for sqlite. Comments can be included
# within sql statements using C style /* ... */ comments, BUT
# THE COMMENTS MUST NOT INCLUDE %s OR ?.
########################################################################
# Standard Library modules
import re
# pyGTK modules
# FreePokerTools modules
class Sql:
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
def __init__(self, game = 'holdem', db_server = 'mysql'):
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
self.query = {}
###############################################################################3
# Support for the Free Poker DataBase = fpdb http://fpdb.sourceforge.net/
#
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
################################
# List tables
################################
if db_server == 'mysql':
self.query['list_tables'] = """SHOW TABLES"""
elif db_server == 'postgresql':
self.query['list_tables'] = """SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'"""
elif db_server == 'sqlite':
self.query['list_tables'] = """SELECT name FROM sqlite_master
WHERE type='table'
ORDER BY name;"""
SQL.py - Add functions for listing indexes. Not used anywhere - may be a good reference at some point
2010-06-04 09:26:50 +02:00
################################
# List indexes
################################
if db_server == 'mysql':
fix name of list indexes query
2010-06-06 14:21:21 +02:00
self.query['list_indexes'] = """SHOW INDEXES"""
SQL.py - Add functions for listing indexes. Not used anywhere - may be a good reference at some point
2010-06-04 09:26:50 +02:00
elif db_server == 'postgresql':
fix name of list indexes query
2010-06-06 14:21:21 +02:00
self.query['list_indexes'] = """SELECT tablename, indexname FROM PG_INDEXES"""
SQL.py - Add functions for listing indexes. Not used anywhere - may be a good reference at some point
2010-06-04 09:26:50 +02:00
elif db_server == 'sqlite':
fix name of list indexes query
2010-06-06 14:21:21 +02:00
self.query['list_indexes'] = """SELECT name FROM sqlite_master
SQL.py - Add functions for listing indexes. Not used anywhere - may be a good reference at some point
2010-06-04 09:26:50 +02:00
WHERE type='index'
ORDER BY name;"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
##################################################################
# Drop Tables - MySQL, PostgreSQL and SQLite all share same syntax
##################################################################
self.query['drop_table'] = """DROP TABLE IF EXISTS """
merge fpdb_db.py into Database.py
2010-01-27 00:54:04 +01:00
##################################################################
# Set transaction isolation level
##################################################################
if db_server == 'mysql' or db_server == 'postgresql':
self.query['set tx level'] = """SET SESSION TRANSACTION
ISOLATION LEVEL READ COMMITTED"""
elif db_server == 'sqlite':
self.query['set tx level'] = """ """
################################
# Select basic info
################################
self.query['getSiteId'] = """SELECT id from Sites where name = %s"""
self.query['getGames'] = """SELECT DISTINCT category from Gametypes"""
self.query['getLimits'] = """SELECT DISTINCT bigBlind from Gametypes ORDER by bigBlind DESC"""
intermediate commit on the way to tourney stats
2010-07-10 05:19:50 +02:00
self.query['getTourneyTypesIds'] = "SELECT id FROM TourneyTypes"
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
################################
# Create Settings
################################
if db_server == 'mysql':
self.query['createSettingsTable'] = """CREATE TABLE Settings (
version SMALLINT NOT NULL)
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createSettingsTable'] = """CREATE TABLE Settings (version SMALLINT NOT NULL)"""
elif db_server == 'sqlite':
self.query['createSettingsTable'] = """CREATE TABLE Settings
(version INTEGER NOT NULL) """
add new tables RawHands/RawTourneys
2010-08-21 04:29:29 +02:00
################################
# Create RawHands (this table is all but identical with RawTourneys)
################################
if db_server == 'mysql':
self.query['createRawHands'] = """CREATE TABLE RawHands (
id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
handId BIGINT NOT NULL,
rawHand TEXT NOT NULL,
complain BOOLEAN NOT NULL DEFAULT FALSE)
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createRawHands'] = """CREATE TABLE RawHands (
id BIGSERIAL, PRIMARY KEY (id),
handId BIGINT NOT NULL,
rawHand TEXT NOT NULL,
complain BOOLEAN NOT NULL DEFAULT FALSE)"""
elif db_server == 'sqlite':
self.query['createRawHands'] = """CREATE TABLE RawHands (
id INTEGER PRIMARY KEY,
handId BIGINT NOT NULL,
rawHand TEXT NOT NULL,
complain BOOLEAN NOT NULL DEFAULT FALSE)"""
################################
# Create RawTourneys (this table is all but identical with RawHands)
################################
if db_server == 'mysql':
self.query['createRawTourneys'] = """CREATE TABLE RawTourneys (
id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
tourneyId BIGINT NOT NULL,
rawTourney TEXT NOT NULL,
complain BOOLEAN NOT NULL DEFAULT FALSE)
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createRawTourneys'] = """CREATE TABLE RawTourneys (
id BIGSERIAL, PRIMARY KEY (id),
tourneyId BIGINT NOT NULL,
rawTourney TEXT NOT NULL,
complain BOOLEAN NOT NULL DEFAULT FALSE)"""
elif db_server == 'sqlite':
self.query['createRawTourneys'] = """CREATE TABLE RawTourneys (
id INTEGER PRIMARY KEY,
tourneyId BIGINT NOT NULL,
rawTourney TEXT NOT NULL,
complain BOOLEAN NOT NULL DEFAULT FALSE)"""
* Added HandsActions & Actions indexes & foreign keys to Database.py * Added 'createActionsTable' to the SQL dictionary * Updated create_tables so 'createActionsTable' would be called * Updated dumpdatabase(), adding in u'Actions' * Added action name & code info for filling the Actions table in FillDefaultData()
2010-09-28 22:59:37 +02:00
################################
# Create Actions
################################
if db_server == 'mysql':
self.query['createActionsTable'] = """CREATE TABLE Actions (
id SMALLINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
name varchar(32) NOT NULL,
SQL: Fix MySQL/Postgres Actions and HandsActions
2010-09-30 11:19:35 +02:00
code char(4) NOT NULL)
* Added HandsActions & Actions indexes & foreign keys to Database.py * Added 'createActionsTable' to the SQL dictionary * Updated create_tables so 'createActionsTable' would be called * Updated dumpdatabase(), adding in u'Actions' * Added action name & code info for filling the Actions table in FillDefaultData()
2010-09-28 22:59:37 +02:00
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createActionsTable'] = """CREATE TABLE Actions (
id SERIAL, PRIMARY KEY (id),
name varchar(32),
SQL: Fix MySQL/Postgres Actions and HandsActions
2010-09-30 11:19:35 +02:00
code char(4))"""
* Added HandsActions & Actions indexes & foreign keys to Database.py * Added 'createActionsTable' to the SQL dictionary * Updated create_tables so 'createActionsTable' would be called * Updated dumpdatabase(), adding in u'Actions' * Added action name & code info for filling the Actions table in FillDefaultData()
2010-09-28 22:59:37 +02:00
elif db_server == 'sqlite':
self.query['createActionsTable'] = """CREATE TABLE Actions (
id INTEGER PRIMARY KEY,
name TEXT NOT NULL,
code TEXT NOT NULL)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
################################
# Create Sites
################################
if db_server == 'mysql':
self.query['createSitesTable'] = """CREATE TABLE Sites (
id SMALLINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
name varchar(32) NOT NULL,
moved currency field from Sites to Gametypes&TourneyTypes, addded Sites.code
2010-06-20 17:34:58 +02:00
code char(2) NOT NULL)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createSitesTable'] = """CREATE TABLE Sites (
id SERIAL, PRIMARY KEY (id),
name varchar(32),
moved currency field from Sites to Gametypes&TourneyTypes, addded Sites.code
2010-06-20 17:34:58 +02:00
code char(2))"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
elif db_server == 'sqlite':
self.query['createSitesTable'] = """CREATE TABLE Sites (
id INTEGER PRIMARY KEY,
name TEXT NOT NULL,
moved currency field from Sites to Gametypes&TourneyTypes, addded Sites.code
2010-06-20 17:34:58 +02:00
code TEXT NOT NULL)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
DB: add backings table, fix a couple of log entries
2010-07-11 12:47:28 +02:00
################################
# Create Backings
################################
if db_server == 'mysql':
self.query['createBackingsTable'] = """CREATE TABLE Backings (
id SMALLINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
missed a spot
2010-08-11 04:50:01 +02:00
tourneysPlayersId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id),
DB: add backings table, fix a couple of log entries
2010-07-11 12:47:28 +02:00
playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
buyInPercentage FLOAT UNSIGNED NOT NULL,
payOffPercentage FLOAT UNSIGNED NOT NULL) ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createBackingsTable'] = """CREATE TABLE Backings (
id BIGSERIAL, PRIMARY KEY (id),
missed a spot
2010-08-11 04:50:01 +02:00
tourneysPlayersId INT NOT NULL, FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id),
DB: add backings table, fix a couple of log entries
2010-07-11 12:47:28 +02:00
playerId INT NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
fix pgsql table creation
2010-07-31 22:27:24 +02:00
buyInPercentage FLOAT NOT NULL,
payOffPercentage FLOAT NOT NULL)"""
DB: add backings table, fix a couple of log entries
2010-07-11 12:47:28 +02:00
elif db_server == 'sqlite':
self.query['createBackingsTable'] = """CREATE TABLE Backings (
id INTEGER PRIMARY KEY,
correct Backings.tourneysPlayerId to tourneysPlayersId like it's used in HP
2010-08-11 04:43:17 +02:00
tourneysPlayersId INT NOT NULL,
DB: add backings table, fix a couple of log entries
2010-07-11 12:47:28 +02:00
playerId INT NOT NULL,
buyInPercentage REAL UNSIGNED NOT NULL,
payOffPercentage REAL UNSIGNED NOT NULL)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
################################
# Create Gametypes
################################
if db_server == 'mysql':
self.query['createGametypesTable'] = """CREATE TABLE Gametypes (
id SMALLINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
moved currency field from Sites to Gametypes&TourneyTypes, addded Sites.code
2010-06-20 17:34:58 +02:00
currency varchar(4) NOT NULL,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
type char(4) NOT NULL,
base char(4) NOT NULL,
category varchar(9) NOT NULL,
limitType char(2) NOT NULL,
hiLo char(1) NOT NULL,
smallBlind int,
bigBlind int,
smallBet int NOT NULL,
bigBet int NOT NULL)
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createGametypesTable'] = """CREATE TABLE Gametypes (
id SERIAL, PRIMARY KEY (id),
siteId INTEGER, FOREIGN KEY (siteId) REFERENCES Sites(id),
moved currency field from Sites to Gametypes&TourneyTypes, addded Sites.code
2010-06-20 17:34:58 +02:00
currency varchar(4),
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
type char(4),
base char(4),
category varchar(9),
limitType char(2),
hiLo char(1),
smallBlind int,
bigBlind int,
smallBet int,
bigBet int)"""
elif db_server == 'sqlite':
DB: Fix capitalisation of Gametypes table in SQLite
2010-07-12 11:00:50 +02:00
self.query['createGametypesTable'] = """CREATE TABLE Gametypes (
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
id INTEGER PRIMARY KEY,
siteId INTEGER,
moved currency field from Sites to Gametypes&TourneyTypes, addded Sites.code
2010-06-20 17:34:58 +02:00
currency TEXT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
type TEXT,
base TEXT,
category TEXT,
limitType TEXT,
hiLo TEXT,
smallBlind INTEGER,
bigBlind INTEGER,
smallBet INTEGER,
bigBet INTEGER,
FOREIGN KEY(siteId) REFERENCES Sites(id) ON DELETE CASCADE)"""
################################
# Create Players
################################
if db_server == 'mysql':
self.query['createPlayersTable'] = """CREATE TABLE Players (
id INT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
name VARCHAR(32) CHARACTER SET utf8 NOT NULL,
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
comment text,
commentTs DATETIME)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createPlayersTable'] = """CREATE TABLE Players (
id SERIAL, PRIMARY KEY (id),
name VARCHAR(32),
siteId INTEGER, FOREIGN KEY (siteId) REFERENCES Sites(id),
comment text,
commentTs timestamp without time zone)"""
elif db_server == 'sqlite':
self.query['createPlayersTable'] = """CREATE TABLE Players (
id INTEGER PRIMARY KEY,
name TEXT,
siteId INTEGER,
comment TEXT,
commentTs REAL,
FOREIGN KEY(siteId) REFERENCES Sites(id) ON DELETE CASCADE)"""
################################
# Create Autorates
################################
if db_server == 'mysql':
self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
description varchar(50) NOT NULL,
shortDesc char(8) NOT NULL,
ratingTime DATETIME NOT NULL,
handCount int NOT NULL)
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
id BIGSERIAL, PRIMARY KEY (id),
playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
description varchar(50),
shortDesc char(8),
ratingTime timestamp without time zone,
handCount int)"""
elif db_server == 'sqlite':
self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
id INTEGER PRIMARY KEY,
create/alter unique indexes and change inserts into tourneytypes and tourneysplayers
2009-09-26 00:10:58 +02:00
playerId INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
gametypeId INT,
description TEXT,
shortDesc TEXT,
ratingTime REAL,
handCount int)"""
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
################################
# Create Hands
################################
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
if db_server == 'mysql':
self.query['createHandsTable'] = """CREATE TABLE Hands (
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
Extend the tablename field in sql to 22 characters
2009-11-07 03:17:28 +01:00
tableName VARCHAR(22) NOT NULL,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
siteHandNo BIGINT NOT NULL,
TOURNEY: fix recording of Hands.tourneyId, allow it to be NULL
2010-07-15 02:08:59 +02:00
tourneyId INT UNSIGNED,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
startTime DATETIME NOT NULL,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
importTime DATETIME NOT NULL,
seats TINYINT NOT NULL,
maxSeats TINYINT NOT NULL,
remove default value and allow null for Hands.rush
2010-07-11 06:37:25 +02:00
rush BOOLEAN,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
boardcard1 smallint, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
boardcard2 smallint,
boardcard3 smallint,
boardcard4 smallint,
boardcard5 smallint,
texture smallint,
playersVpi SMALLINT NOT NULL, /* num of players vpi */
playersAtStreet1 SMALLINT NOT NULL, /* num of players seeing flop/street4 */
playersAtStreet2 SMALLINT NOT NULL,
playersAtStreet3 SMALLINT NOT NULL,
playersAtStreet4 SMALLINT NOT NULL,
playersAtShowdown SMALLINT NOT NULL,
street0Raises TINYINT NOT NULL, /* num small bets paid to see flop/street4, including blind */
street1Raises TINYINT NOT NULL, /* num small bets paid to see turn/street5 */
street2Raises TINYINT NOT NULL, /* num big bets paid to see river/street6 */
street3Raises TINYINT NOT NULL, /* num big bets paid to see sd/street7 */
street4Raises TINYINT NOT NULL, /* num big bets paid to see showdown */
street1Pot INT, /* pot size at flop/street4 */
street2Pot INT, /* pot size at turn/street5 */
street3Pot INT, /* pot size at river/street6 */
street4Pot INT, /* pot size at sd/street7 */
showdownPot INT, /* pot size at sd/street7 */
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
comment TEXT,
commentTs DATETIME)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createHandsTable'] = """CREATE TABLE Hands (
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
id BIGSERIAL, PRIMARY KEY (id),
Extend the tablename field in sql to 22 characters
2009-11-07 03:17:28 +01:00
tableName VARCHAR(22) NOT NULL,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
siteHandNo BIGINT NOT NULL,
TOURNEY: fix recording of Hands.tourneyId, allow it to be NULL
2010-07-15 02:08:59 +02:00
tourneyId INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
gametypeId INT NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
startTime timestamp without time zone NOT NULL,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
importTime timestamp without time zone NOT NULL,
seats SMALLINT NOT NULL,
maxSeats SMALLINT NOT NULL,
remove default value and allow null for Hands.rush
2010-07-11 06:37:25 +02:00
rush BOOLEAN,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
boardcard1 smallint, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
boardcard2 smallint,
boardcard3 smallint,
boardcard4 smallint,
boardcard5 smallint,
texture smallint,
playersVpi SMALLINT NOT NULL, /* num of players vpi */
playersAtStreet1 SMALLINT NOT NULL, /* num of players seeing flop/street4 */
playersAtStreet2 SMALLINT NOT NULL,
playersAtStreet3 SMALLINT NOT NULL,
playersAtStreet4 SMALLINT NOT NULL,
playersAtShowdown SMALLINT NOT NULL,
street0Raises SMALLINT NOT NULL, /* num small bets paid to see flop/street4, including blind */
street1Raises SMALLINT NOT NULL, /* num small bets paid to see turn/street5 */
street2Raises SMALLINT NOT NULL, /* num big bets paid to see river/street6 */
street3Raises SMALLINT NOT NULL, /* num big bets paid to see sd/street7 */
street4Raises SMALLINT NOT NULL, /* num big bets paid to see showdown */
street1Pot INT, /* pot size at flop/street4 */
street2Pot INT, /* pot size at turn/street5 */
street3Pot INT, /* pot size at river/street6 */
street4Pot INT, /* pot size at sd/street7 */
showdownPot INT, /* pot size at sd/street7 */
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
comment TEXT,
commentTs timestamp without time zone)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
elif db_server == 'sqlite':
self.query['createHandsTable'] = """CREATE TABLE Hands (
id INTEGER PRIMARY KEY,
Extend the tablename field in sql to 22 characters
2009-11-07 03:17:28 +01:00
tableName TEXT(22) NOT NULL,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
siteHandNo INT NOT NULL,
TOURNEY: fix recording of Hands.tourneyId, allow it to be NULL
2010-07-15 02:08:59 +02:00
tourneyId INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
gametypeId INT NOT NULL,
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
startTime REAL NOT NULL,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
importTime REAL NOT NULL,
seats INT NOT NULL,
maxSeats INT NOT NULL,
remove default value and allow null for Hands.rush
2010-07-11 06:37:25 +02:00
rush BOOLEAN,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
boardcard1 INT, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
boardcard2 INT,
boardcard3 INT,
boardcard4 INT,
boardcard5 INT,
texture INT,
playersVpi INT NOT NULL, /* num of players vpi */
playersAtStreet1 INT NOT NULL, /* num of players seeing flop/street4 */
playersAtStreet2 INT NOT NULL,
playersAtStreet3 INT NOT NULL,
playersAtStreet4 INT NOT NULL,
playersAtShowdown INT NOT NULL,
street0Raises INT NOT NULL, /* num small bets paid to see flop/street4, including blind */
street1Raises INT NOT NULL, /* num small bets paid to see turn/street5 */
street2Raises INT NOT NULL, /* num big bets paid to see river/street6 */
street3Raises INT NOT NULL, /* num big bets paid to see sd/street7 */
street4Raises INT NOT NULL, /* num big bets paid to see showdown */
street1Pot INT, /* pot size at flop/street4 */
street2Pot INT, /* pot size at turn/street5 */
street3Pot INT, /* pot size at river/street6 */
street4Pot INT, /* pot size at sd/street7 */
showdownPot INT, /* pot size at sd/street7 */
create/alter unique indexes and change inserts into tourneytypes and tourneysplayers
2009-09-26 00:10:58 +02:00
comment TEXT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
commentTs REAL)"""
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
################################
# Create TourneyTypes
################################
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
if db_server == 'mysql':
self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
id SMALLINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
DB: allow NULL for TT.currency/buyin/fee for when this info is not available
2010-07-23 04:00:25 +02:00
currency varchar(4),
buyIn INT,
fee INT,
DB: add category and limitType to TourneyTypes
2010-07-11 06:42:37 +02:00
category varchar(9) NOT NULL,
limitType char(2) NOT NULL,
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
buyInChips INT,
maxSeats INT,
rebuy BOOLEAN,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
rebuyCost INT,
DB: add TourneyTypes.rebuyFee and addOnFee
2010-07-14 01:49:55 +02:00
rebuyFee INT,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
rebuyChips INT,
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
addOn BOOLEAN,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
addOnCost INT,
DB: add TourneyTypes.rebuyFee and addOnFee
2010-07-14 01:49:55 +02:00
addOnFee INT,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
addOnChips INT,
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
knockout BOOLEAN,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
koBounty INT,
speed varchar(10),
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
shootout BOOLEAN,
matrix BOOLEAN,
sng BOOLEAN,
satellite BOOLEAN,
doubleOrNothing BOOLEAN,
DB: Added TT.added, addedCurrency
2010-07-17 02:19:12 +02:00
guarantee INT,
added INT,
addedCurrency VARCHAR(4))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
id SERIAL, PRIMARY KEY (id),
siteId INT NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
DB: allow NULL for TT.currency/buyin/fee for when this info is not available
2010-07-23 04:00:25 +02:00
currency varchar(4),
buyin INT,
fee INT,
DB: add category and limitType to TourneyTypes
2010-07-11 06:42:37 +02:00
category varchar(9),
limitType char(2),
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
buyInChips INT,
maxSeats INT,
rebuy BOOLEAN,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
rebuyCost INT,
DB: add TourneyTypes.rebuyFee and addOnFee
2010-07-14 01:49:55 +02:00
rebuyFee INT,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
rebuyChips INT,
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
addOn BOOLEAN,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
addOnCost INT,
DB: add TourneyTypes.rebuyFee and addOnFee
2010-07-14 01:49:55 +02:00
addOnFee INT,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
addOnChips INT,
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
knockout BOOLEAN,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
koBounty INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
speed varchar(10),
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
shootout BOOLEAN,
matrix BOOLEAN,
sng BOOLEAN,
satellite BOOLEAN,
doubleOrNothing BOOLEAN,
DB: Added TT.added, addedCurrency
2010-07-17 02:19:12 +02:00
guarantee INT,
added INT,
addedCurrency VARCHAR(4))"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
elif db_server == 'sqlite':
self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
id INTEGER PRIMARY KEY,
siteId INT NOT NULL,
DB: allow NULL for TT.currency/buyin/fee for when this info is not available
2010-07-23 04:00:25 +02:00
currency VARCHAR(4),
buyin INT,
fee INT,
DB: add category and limitType to TourneyTypes
2010-07-11 06:42:37 +02:00
category TEXT,
limitType TEXT,
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
buyInChips INT,
maxSeats INT,
rebuy BOOLEAN,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
rebuyCost INT,
DB: add TourneyTypes.rebuyFee and addOnFee
2010-07-14 01:49:55 +02:00
rebuyFee INT,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
rebuyChips INT,
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
addOn BOOLEAN,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
addOnCost INT,
DB: add TourneyTypes.rebuyFee and addOnFee
2010-07-14 01:49:55 +02:00
addOnFee INT,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
addOnChips INT,
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
knockout BOOLEAN,
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
koBounty INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
speed TEXT,
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
shootout BOOLEAN,
matrix BOOLEAN,
sng BOOLEAN,
satellite BOOLEAN,
doubleOrNothing BOOLEAN,
DB: Added TT.added, addedCurrency
2010-07-17 02:19:12 +02:00
guarantee INT,
added INT,
addedCurrency VARCHAR(4))"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
################################
# Create Tourneys
################################
if db_server == 'mysql':
self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
id INT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
siteTourneyNo BIGINT NOT NULL,
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
entries INT,
prizepool INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
startTime DATETIME NOT NULL,
endTime DATETIME,
tourneyName varchar(40),
matrixIdProcessed TINYINT UNSIGNED DEFAULT 0, /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
totalRebuyCount INT,
totalAddOnCount INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
comment TEXT,
commentTs DATETIME)
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
id SERIAL, PRIMARY KEY (id),
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
tourneyTypeId INT, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
siteTourneyNo BIGINT,
entries INT,
prizepool INT,
startTime timestamp without time zone,
endTime timestamp without time zone,
tourneyName varchar(40),
matrixIdProcessed SMALLINT DEFAULT 0, /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
totalRebuyCount INT,
totalAddOnCount INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
comment TEXT,
commentTs timestamp without time zone)"""
elif db_server == 'sqlite':
self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
id INTEGER PRIMARY KEY,
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
tourneyTypeId INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
siteTourneyNo INT,
entries INT,
prizepool INT,
startTime REAL,
endTime REAL,
tourneyName TEXT,
matrixIdProcessed INT UNSIGNED DEFAULT 0, /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */
more tourney work - moved HH-based tourney handling completely into Hand - renamed Tourney.py to TourneySummaries - changed many DB fields to allow NULL and removed defaults
2010-07-07 04:01:40 +02:00
totalRebuyCount INT,
totalAddOnCount INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
comment TEXT,
commentTs REAL)"""
################################
# Create HandsPlayers
################################
if db_server == 'mysql':
self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
handId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handId) REFERENCES Hands(id),
playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
startCash INT NOT NULL,
position CHAR(1),
seatNo SMALLINT NOT NULL,
added HandsPlayers.sitout as discussed on ML
2010-07-02 22:17:15 +02:00
sitout BOOLEAN NOT NULL,
add HP.wentAllInOnStreet field. explanation on wiki.
2010-08-04 23:41:50 +02:00
wentAllInOnStreet SMALLINT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
card1 smallint NOT NULL, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
card2 smallint NOT NULL,
card3 smallint,
card4 smallint,
card5 smallint,
card6 smallint,
card7 smallint,
startCards smallint,
ante INT,
winnings int NOT NULL,
rake int NOT NULL,
totalProfit INT,
comment text,
commentTs DATETIME,
add rebuild indexes option to Database menu (can we put tooltips over these menu options?)
2009-11-30 00:02:45 +01:00
tourneysPlayersId BIGINT UNSIGNED, FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id),
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
wonWhenSeenStreet1 FLOAT,
wonWhenSeenStreet2 FLOAT,
wonWhenSeenStreet3 FLOAT,
wonWhenSeenStreet4 FLOAT,
wonAtSD FLOAT,
street0VPI BOOLEAN,
street0Aggr BOOLEAN,
street0_3BChance BOOLEAN,
street0_3BDone BOOLEAN,
street0_4BChance BOOLEAN,
street0_4BDone BOOLEAN,
other3BStreet0 BOOLEAN,
other4BStreet0 BOOLEAN,
street1Seen BOOLEAN,
street2Seen BOOLEAN,
street3Seen BOOLEAN,
street4Seen BOOLEAN,
sawShowdown BOOLEAN,
street1Aggr BOOLEAN,
street2Aggr BOOLEAN,
street3Aggr BOOLEAN,
street4Aggr BOOLEAN,
otherRaisedStreet0 BOOLEAN,
otherRaisedStreet1 BOOLEAN,
otherRaisedStreet2 BOOLEAN,
otherRaisedStreet3 BOOLEAN,
otherRaisedStreet4 BOOLEAN,
foldToOtherRaisedStreet0 BOOLEAN,
foldToOtherRaisedStreet1 BOOLEAN,
foldToOtherRaisedStreet2 BOOLEAN,
foldToOtherRaisedStreet3 BOOLEAN,
foldToOtherRaisedStreet4 BOOLEAN,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
raiseFirstInChance BOOLEAN,
raisedFirstIn BOOLEAN,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
foldBbToStealChance BOOLEAN,
foldedBbToSteal BOOLEAN,
foldSbToStealChance BOOLEAN,
foldedSbToSteal BOOLEAN,
street1CBChance BOOLEAN,
street1CBDone BOOLEAN,
street2CBChance BOOLEAN,
street2CBDone BOOLEAN,
street3CBChance BOOLEAN,
street3CBDone BOOLEAN,
street4CBChance BOOLEAN,
street4CBDone BOOLEAN,
foldToStreet1CBChance BOOLEAN,
foldToStreet1CBDone BOOLEAN,
foldToStreet2CBChance BOOLEAN,
foldToStreet2CBDone BOOLEAN,
foldToStreet3CBChance BOOLEAN,
foldToStreet3CBDone BOOLEAN,
foldToStreet4CBChance BOOLEAN,
foldToStreet4CBDone BOOLEAN,
street1CheckCallRaiseChance BOOLEAN,
street1CheckCallRaiseDone BOOLEAN,
street2CheckCallRaiseChance BOOLEAN,
street2CheckCallRaiseDone BOOLEAN,
street3CheckCallRaiseChance BOOLEAN,
street3CheckCallRaiseDone BOOLEAN,
street4CheckCallRaiseChance BOOLEAN,
street4CheckCallRaiseDone BOOLEAN,
street0Calls TINYINT,
street1Calls TINYINT,
street2Calls TINYINT,
street3Calls TINYINT,
street4Calls TINYINT,
street0Bets TINYINT,
street1Bets TINYINT,
street2Bets TINYINT,
street3Bets TINYINT,
street4Bets TINYINT,
street0Raises TINYINT,
street1Raises TINYINT,
street2Raises TINYINT,
street3Raises TINYINT,
street4Raises TINYINT,
add rebuild indexes option to Database menu (can we put tooltips over these menu options?)
2009-11-30 00:02:45 +01:00
actionString VARCHAR(15))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
id BIGSERIAL, PRIMARY KEY (id),
handId BIGINT NOT NULL, FOREIGN KEY (handId) REFERENCES Hands(id),
playerId INT NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
startCash INT NOT NULL,
position CHAR(1),
seatNo SMALLINT NOT NULL,
added HandsPlayers.sitout as discussed on ML
2010-07-02 22:17:15 +02:00
sitout BOOLEAN NOT NULL,
add HP.wentAllInOnStreet field. explanation on wiki.
2010-08-04 23:41:50 +02:00
wentAllInOnStreet SMALLINT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
card1 smallint NOT NULL, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
card2 smallint NOT NULL,
card3 smallint,
card4 smallint,
card5 smallint,
card6 smallint,
card7 smallint,
startCards smallint,
ante INT,
winnings int NOT NULL,
rake int NOT NULL,
totalProfit INT,
comment text,
commentTs timestamp without time zone,
removed 2 ancient unusued methods and updated TourneysPlayers tested bulk import for PS and FTP, player stats and positional stats also fixed a little bug that sqlite created HandsPlayers.actionString with type REAL instead of VARCHAR
2010-06-22 21:05:33 +02:00
tourneysPlayersId BIGINT, FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id),
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
wonWhenSeenStreet1 FLOAT,
wonWhenSeenStreet2 FLOAT,
wonWhenSeenStreet3 FLOAT,
wonWhenSeenStreet4 FLOAT,
wonAtSD FLOAT,
street0VPI BOOLEAN,
street0Aggr BOOLEAN,
street0_3BChance BOOLEAN,
street0_3BDone BOOLEAN,
street0_4BChance BOOLEAN,
street0_4BDone BOOLEAN,
other3BStreet0 BOOLEAN,
other4BStreet0 BOOLEAN,
street1Seen BOOLEAN,
street2Seen BOOLEAN,
street3Seen BOOLEAN,
street4Seen BOOLEAN,
sawShowdown BOOLEAN,
street1Aggr BOOLEAN,
street2Aggr BOOLEAN,
street3Aggr BOOLEAN,
street4Aggr BOOLEAN,
otherRaisedStreet0 BOOLEAN,
otherRaisedStreet1 BOOLEAN,
otherRaisedStreet2 BOOLEAN,
otherRaisedStreet3 BOOLEAN,
otherRaisedStreet4 BOOLEAN,
foldToOtherRaisedStreet0 BOOLEAN,
foldToOtherRaisedStreet1 BOOLEAN,
foldToOtherRaisedStreet2 BOOLEAN,
foldToOtherRaisedStreet3 BOOLEAN,
foldToOtherRaisedStreet4 BOOLEAN,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
raiseFirstInChance BOOLEAN,
raisedFirstIn BOOLEAN,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
foldBbToStealChance BOOLEAN,
foldedBbToSteal BOOLEAN,
foldSbToStealChance BOOLEAN,
foldedSbToSteal BOOLEAN,
street1CBChance BOOLEAN,
street1CBDone BOOLEAN,
street2CBChance BOOLEAN,
street2CBDone BOOLEAN,
street3CBChance BOOLEAN,
street3CBDone BOOLEAN,
street4CBChance BOOLEAN,
street4CBDone BOOLEAN,
foldToStreet1CBChance BOOLEAN,
foldToStreet1CBDone BOOLEAN,
foldToStreet2CBChance BOOLEAN,
foldToStreet2CBDone BOOLEAN,
foldToStreet3CBChance BOOLEAN,
foldToStreet3CBDone BOOLEAN,
foldToStreet4CBChance BOOLEAN,
foldToStreet4CBDone BOOLEAN,
street1CheckCallRaiseChance BOOLEAN,
street1CheckCallRaiseDone BOOLEAN,
street2CheckCallRaiseChance BOOLEAN,
street2CheckCallRaiseDone BOOLEAN,
street3CheckCallRaiseChance BOOLEAN,
street3CheckCallRaiseDone BOOLEAN,
street4CheckCallRaiseChance BOOLEAN,
street4CheckCallRaiseDone BOOLEAN,
street0Calls SMALLINT,
street1Calls SMALLINT,
street2Calls SMALLINT,
street3Calls SMALLINT,
street4Calls SMALLINT,
street0Bets SMALLINT,
street1Bets SMALLINT,
street2Bets SMALLINT,
street3Bets SMALLINT,
street4Bets SMALLINT,
street0Raises SMALLINT,
street1Raises SMALLINT,
street2Raises SMALLINT,
street3Raises SMALLINT,
street4Raises SMALLINT,
removed 2 ancient unusued methods and updated TourneysPlayers tested bulk import for PS and FTP, player stats and positional stats also fixed a little bug that sqlite created HandsPlayers.actionString with type REAL instead of VARCHAR
2010-06-22 21:05:33 +02:00
actionString VARCHAR(15))"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
elif db_server == 'sqlite':
self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
id INTEGER PRIMARY KEY,
handId INT NOT NULL,
playerId INT NOT NULL,
startCash INT NOT NULL,
position TEXT,
seatNo INT NOT NULL,
added HandsPlayers.sitout as discussed on ML
2010-07-02 22:17:15 +02:00
sitout BOOLEAN NOT NULL,
add HP.wentAllInOnStreet field. explanation on wiki.
2010-08-04 23:41:50 +02:00
wentAllInOnStreet INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
card1 INT NOT NULL, /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
card2 INT NOT NULL,
card3 INT,
card4 INT,
card5 INT,
card6 INT,
card7 INT,
startCards INT,
ante INT,
winnings INT NOT NULL,
rake INT NOT NULL,
totalProfit INT,
comment TEXT,
commentTs REAL,
tourneysPlayersId INT,
wonWhenSeenStreet1 REAL,
wonWhenSeenStreet2 REAL,
wonWhenSeenStreet3 REAL,
wonWhenSeenStreet4 REAL,
wonAtSD REAL,
street0VPI INT,
street0Aggr INT,
street0_3BChance INT,
street0_3BDone INT,
street0_4BChance INT,
street0_4BDone INT,
other3BStreet0 INT,
other4BStreet0 INT,
street1Seen INT,
street2Seen INT,
street3Seen INT,
street4Seen INT,
sawShowdown INT,
street1Aggr INT,
street2Aggr INT,
street3Aggr INT,
street4Aggr INT,
otherRaisedStreet0 INT,
otherRaisedStreet1 INT,
otherRaisedStreet2 INT,
otherRaisedStreet3 INT,
otherRaisedStreet4 INT,
foldToOtherRaisedStreet0 INT,
foldToOtherRaisedStreet1 INT,
foldToOtherRaisedStreet2 INT,
foldToOtherRaisedStreet3 INT,
foldToOtherRaisedStreet4 INT,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
raiseFirstInChance INT,
raisedFirstIn INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
foldBbToStealChance INT,
foldedBbToSteal INT,
foldSbToStealChance INT,
foldedSbToSteal INT,
street1CBChance INT,
street1CBDone INT,
street2CBChance INT,
street2CBDone INT,
street3CBChance INT,
street3CBDone INT,
street4CBChance INT,
street4CBDone INT,
foldToStreet1CBChance INT,
foldToStreet1CBDone INT,
foldToStreet2CBChance INT,
foldToStreet2CBDone INT,
foldToStreet3CBChance INT,
foldToStreet3CBDone INT,
foldToStreet4CBChance INT,
foldToStreet4CBDone INT,
street1CheckCallRaiseChance INT,
street1CheckCallRaiseDone INT,
street2CheckCallRaiseChance INT,
street2CheckCallRaiseDone INT,
street3CheckCallRaiseChance INT,
street3CheckCallRaiseDone INT,
street4CheckCallRaiseChance INT,
street4CheckCallRaiseDone INT,
street0Calls INT,
street1Calls INT,
street2Calls INT,
street3Calls INT,
street4Calls INT,
street0Bets INT,
street1Bets INT,
street2Bets INT,
street3Bets INT,
street4Bets INT,
street0Raises INT,
street1Raises INT,
street2Raises INT,
street3Raises INT,
street4Raises INT,
removed 2 ancient unusued methods and updated TourneysPlayers tested bulk import for PS and FTP, player stats and positional stats also fixed a little bug that sqlite created HandsPlayers.actionString with type REAL instead of VARCHAR
2010-06-22 21:05:33 +02:00
actionString VARCHAR(15))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
"""
################################
# Create TourneysPlayers
################################
if db_server == 'mysql':
self.query['createTourneysPlayersTable'] = """CREATE TABLE TourneysPlayers (
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),
minor DB changes. recording TourneysPlayers now for FTP and PS
2010-07-07 00:52:44 +02:00
rank INT,
winnings INT,
winningsCurrency VARCHAR(4),
rebuyCount INT,
addOnCount INT,
koCount INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
comment TEXT,
commentTs DATETIME)
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createTourneysPlayersTable'] = """CREATE TABLE TourneysPlayers (
id BIGSERIAL, PRIMARY KEY (id),
tourneyId INT, FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
rank INT,
winnings INT,
removed 2 ancient unusued methods and updated TourneysPlayers tested bulk import for PS and FTP, player stats and positional stats also fixed a little bug that sqlite created HandsPlayers.actionString with type REAL instead of VARCHAR
2010-06-22 21:05:33 +02:00
winningsCurrency VARCHAR(4),
minor DB changes. recording TourneysPlayers now for FTP and PS
2010-07-07 00:52:44 +02:00
rebuyCount INT,
addOnCount INT,
koCount INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
comment TEXT,
commentTs timestamp without time zone)"""
elif db_server == 'sqlite':
self.query['createTourneysPlayersTable'] = """CREATE TABLE TourneysPlayers (
corrected sqlite table layout. this also fixes hudcache generation for tourneys on sqlite
2010-08-11 04:25:47 +02:00
id INTEGER PRIMARY KEY,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
tourneyId INT,
playerId INT,
rank INT,
winnings INT,
removed 2 ancient unusued methods and updated TourneysPlayers tested bulk import for PS and FTP, player stats and positional stats also fixed a little bug that sqlite created HandsPlayers.actionString with type REAL instead of VARCHAR
2010-06-22 21:05:33 +02:00
winningsCurrency VARCHAR(4),
minor DB changes. recording TourneysPlayers now for FTP and PS
2010-07-07 00:52:44 +02:00
rebuyCount INT,
addOnCount INT,
koCount INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
comment TEXT,
commentTs timestamp without time zone,
FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
FOREIGN KEY (playerId) REFERENCES Players(id)
)"""
################################
# Create HandsActions
################################
if db_server == 'mysql':
self.query['createHandsActionsTable'] = """CREATE TABLE HandsActions (
id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
handsPlayerId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handsPlayerId) REFERENCES HandsPlayers(id),
street SMALLINT NOT NULL,
actionNo SMALLINT NOT NULL,
* updated 'createHandsActionsTable' and 'store_hands_actions' in the SQL dictionary
2010-09-28 23:01:31 +02:00
streetActionNo SMALLINT NOT NULL,
SQL: Fix MySQL/Postgres Actions and HandsActions
2010-09-30 11:19:35 +02:00
actionId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (actionId) REFERENCES Actions(id),
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
amount INT NOT NULL,
* updated 'createHandsActionsTable' and 'store_hands_actions' in the SQL dictionary
2010-09-28 23:01:31 +02:00
raiseTo INT NOT NULL,
amountCalled INT NOT NULL,
numDiscarded SMALLINT NOT NULL,
cardsDiscarded varchar(14),
allIn BOOLEAN NOT NULL)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createHandsActionsTable'] = """CREATE TABLE HandsActions (
id BIGSERIAL, PRIMARY KEY (id),
handsPlayerId BIGINT, FOREIGN KEY (handsPlayerId) REFERENCES HandsPlayers(id),
street SMALLINT,
actionNo SMALLINT,
* updated 'createHandsActionsTable' and 'store_hands_actions' in the SQL dictionary
2010-09-28 23:01:31 +02:00
streetActionNo SMALLINT,
actionId SMALLINT, FOREIGN KEY (actionId) REFERENCES Actions(id),
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
amount INT,
* updated 'createHandsActionsTable' and 'store_hands_actions' in the SQL dictionary
2010-09-28 23:01:31 +02:00
raiseTo INT,
amountCalled INT,
numDiscarded SMALLINT,
cardsDiscarded varchar(14),
allIn BOOLEAN)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
elif db_server == 'sqlite':
self.query['createHandsActionsTable'] = """CREATE TABLE HandsActions (
corrected sqlite table layout. this also fixes hudcache generation for tourneys on sqlite
2010-08-11 04:25:47 +02:00
id INTEGER PRIMARY KEY,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
handsPlayerId BIGINT,
street SMALLINT,
actionNo SMALLINT,
* updated 'createHandsActionsTable' and 'store_hands_actions' in the SQL dictionary
2010-09-28 23:01:31 +02:00
streetActionNo SMALLINT,
actionId SMALLINT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
amount INT,
* updated 'createHandsActionsTable' and 'store_hands_actions' in the SQL dictionary
2010-09-28 23:01:31 +02:00
raiseTo INT,
amountCalled INT,
numDiscarded SMALLINT,
cardsDiscarded TEXT,
allIn BOOLEAN,
FOREIGN KEY (handsPlayerId) REFERENCES HandsPlayers(id),
FOREIGN KEY (actionId) REFERENCES Actions(id) ON DELETE CASCADE
)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
################################
# Create HudCache
################################
if db_server == 'mysql':
self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
activeSeats SMALLINT NOT NULL,
position CHAR(1),
DB: remove default row for TT, allow HP.ttId to be NULL and remove default
2010-07-15 01:18:36 +02:00
tourneyTypeId SMALLINT UNSIGNED, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
reverted HudCache styleKey to include only YYMMDD - however, it now stores the d000000 date based off the tz & offset
2010-11-30 20:05:28 +01:00
styleKey CHAR(7) NOT NULL, /* 1st char is style (A/T/H/S), other 6 are the key */
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
HDs INT NOT NULL,
wonWhenSeenStreet1 FLOAT,
wonWhenSeenStreet2 FLOAT,
wonWhenSeenStreet3 FLOAT,
wonWhenSeenStreet4 FLOAT,
wonAtSD FLOAT,
street0VPI INT,
street0Aggr INT,
street0_3BChance INT,
street0_3BDone INT,
street0_4BChance INT,
street0_4BDone INT,
other3BStreet0 INT,
other4BStreet0 INT,
street1Seen INT,
street2Seen INT,
street3Seen INT,
street4Seen INT,
sawShowdown INT,
street1Aggr INT,
street2Aggr INT,
street3Aggr INT,
street4Aggr INT,
otherRaisedStreet0 INT,
otherRaisedStreet1 INT,
otherRaisedStreet2 INT,
otherRaisedStreet3 INT,
otherRaisedStreet4 INT,
foldToOtherRaisedStreet0 INT,
foldToOtherRaisedStreet1 INT,
foldToOtherRaisedStreet2 INT,
foldToOtherRaisedStreet3 INT,
foldToOtherRaisedStreet4 INT,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
raiseFirstInChance INT,
raisedFirstIn INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
foldBbToStealChance INT,
foldedBbToSteal INT,
foldSbToStealChance INT,
foldedSbToSteal INT,
street1CBChance INT,
street1CBDone INT,
street2CBChance INT,
street2CBDone INT,
street3CBChance INT,
street3CBDone INT,
street4CBChance INT,
street4CBDone INT,
foldToStreet1CBChance INT,
foldToStreet1CBDone INT,
foldToStreet2CBChance INT,
foldToStreet2CBDone INT,
foldToStreet3CBChance INT,
foldToStreet3CBDone INT,
foldToStreet4CBChance INT,
foldToStreet4CBDone INT,
totalProfit INT,
street1CheckCallRaiseChance INT,
street1CheckCallRaiseDone INT,
street2CheckCallRaiseChance INT,
street2CheckCallRaiseDone INT,
street3CheckCallRaiseChance INT,
street3CheckCallRaiseDone INT,
street4CheckCallRaiseChance INT,
street4CheckCallRaiseDone INT,
street0Calls INT,
street1Calls INT,
street2Calls INT,
street3Calls INT,
street4Calls INT,
street0Bets INT,
street1Bets INT,
street2Bets INT,
street3Bets INT,
street4Bets INT,
street0Raises INT,
street1Raises INT,
street2Raises INT,
street3Raises INT,
street4Raises INT)
ENGINE=INNODB"""
elif db_server == 'postgresql':
self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
id BIGSERIAL, PRIMARY KEY (id),
gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
activeSeats SMALLINT,
position CHAR(1),
DB: remove default row for TT, allow HP.ttId to be NULL and remove default
2010-07-15 01:18:36 +02:00
tourneyTypeId INT, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
reverted HudCache styleKey to include only YYMMDD - however, it now stores the d000000 date based off the tz & offset
2010-11-30 20:05:28 +01:00
styleKey CHAR(7) NOT NULL, /* 1st char is style (A/T/H/S), other 6 are the key */
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
HDs INT,
wonWhenSeenStreet1 FLOAT,
wonWhenSeenStreet2 FLOAT,
wonWhenSeenStreet3 FLOAT,
wonWhenSeenStreet4 FLOAT,
wonAtSD FLOAT,
street0VPI INT,
street0Aggr INT,
street0_3BChance INT,
street0_3BDone INT,
street0_4BChance INT,
street0_4BDone INT,
other3BStreet0 INT,
other4BStreet0 INT,
street1Seen INT,
street2Seen INT,
street3Seen INT,
street4Seen INT,
sawShowdown INT,
street1Aggr INT,
street2Aggr INT,
street3Aggr INT,
street4Aggr INT,
otherRaisedStreet0 INT,
otherRaisedStreet1 INT,
otherRaisedStreet2 INT,
otherRaisedStreet3 INT,
otherRaisedStreet4 INT,
foldToOtherRaisedStreet0 INT,
foldToOtherRaisedStreet1 INT,
foldToOtherRaisedStreet2 INT,
foldToOtherRaisedStreet3 INT,
foldToOtherRaisedStreet4 INT,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
raiseFirstInChance INT,
raisedFirstIn INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
foldBbToStealChance INT,
foldedBbToSteal INT,
foldSbToStealChance INT,
foldedSbToSteal INT,
street1CBChance INT,
street1CBDone INT,
street2CBChance INT,
street2CBDone INT,
street3CBChance INT,
street3CBDone INT,
street4CBChance INT,
street4CBDone INT,
foldToStreet1CBChance INT,
foldToStreet1CBDone INT,
foldToStreet2CBChance INT,
foldToStreet2CBDone INT,
foldToStreet3CBChance INT,
foldToStreet3CBDone INT,
foldToStreet4CBChance INT,
foldToStreet4CBDone INT,
totalProfit INT,
street1CheckCallRaiseChance INT,
street1CheckCallRaiseDone INT,
street2CheckCallRaiseChance INT,
street2CheckCallRaiseDone INT,
street3CheckCallRaiseChance INT,
street3CheckCallRaiseDone INT,
street4CheckCallRaiseChance INT,
street4CheckCallRaiseDone INT,
street0Calls INT,
street1Calls INT,
street2Calls INT,
street3Calls INT,
street4Calls INT,
street0Bets INT,
street1Bets INT,
street2Bets INT,
street3Bets INT,
street4Bets INT,
street0Raises INT,
street1Raises INT,
street2Raises INT,
street3Raises INT,
street4Raises INT)
"""
elif db_server == 'sqlite':
self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
id INTEGER PRIMARY KEY,
gametypeId INT,
playerId INT,
activeSeats INT,
position TEXT,
DB: remove default row for TT, allow HP.ttId to be NULL and remove default
2010-07-15 01:18:36 +02:00
tourneyTypeId INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
styleKey TEXT NOT NULL, /* 1st char is style (A/T/H/S), other 6 are the key */
HDs INT,
wonWhenSeenStreet1 REAL,
wonWhenSeenStreet2 REAL,
wonWhenSeenStreet3 REAL,
wonWhenSeenStreet4 REAL,
wonAtSD REAL,
street0VPI INT,
street0Aggr INT,
street0_3BChance INT,
street0_3BDone INT,
street0_4BChance INT,
street0_4BDone INT,
other3BStreet0 INT,
other4BStreet0 INT,
street1Seen INT,
street2Seen INT,
street3Seen INT,
street4Seen INT,
sawShowdown INT,
street1Aggr INT,
street2Aggr INT,
street3Aggr INT,
street4Aggr INT,
otherRaisedStreet0 INT,
otherRaisedStreet1 INT,
otherRaisedStreet2 INT,
otherRaisedStreet3 INT,
otherRaisedStreet4 INT,
foldToOtherRaisedStreet0 INT,
foldToOtherRaisedStreet1 INT,
foldToOtherRaisedStreet2 INT,
foldToOtherRaisedStreet3 INT,
foldToOtherRaisedStreet4 INT,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
raiseFirstInChance INT,
raisedFirstIn INT,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
foldBbToStealChance INT,
foldedBbToSteal INT,
foldSbToStealChance INT,
foldedSbToSteal INT,
street1CBChance INT,
street1CBDone INT,
street2CBChance INT,
street2CBDone INT,
street3CBChance INT,
street3CBDone INT,
street4CBChance INT,
street4CBDone INT,
foldToStreet1CBChance INT,
foldToStreet1CBDone INT,
foldToStreet2CBChance INT,
foldToStreet2CBDone INT,
foldToStreet3CBChance INT,
foldToStreet3CBDone INT,
foldToStreet4CBChance INT,
foldToStreet4CBDone INT,
totalProfit INT,
street1CheckCallRaiseChance INT,
street1CheckCallRaiseDone INT,
street2CheckCallRaiseChance INT,
street2CheckCallRaiseDone INT,
street3CheckCallRaiseChance INT,
street3CheckCallRaiseDone INT,
street4CheckCallRaiseChance INT,
street4CheckCallRaiseDone INT,
street0Calls INT,
street1Calls INT,
street2Calls INT,
street3Calls INT,
street4Calls INT,
street0Bets INT,
street1Bets INT,
street2Bets INT,
street3Bets INT,
street4Bets INT,
street0Raises INT,
street1Raises INT,
street2Raises INT,
street3Raises INT,
street4Raises INT)
"""
if db_server == 'mysql':
self.query['addTourneyIndex'] = """ALTER TABLE Tourneys ADD UNIQUE INDEX siteTourneyNo(siteTourneyNo, tourneyTypeId)"""
elif db_server == 'postgresql':
self.query['addTourneyIndex'] = """CREATE UNIQUE INDEX siteTourneyNo ON Tourneys (siteTourneyNo, tourneyTypeId)"""
elif db_server == 'sqlite':
self.query['addTourneyIndex'] = """CREATE UNIQUE INDEX siteTourneyNo ON Tourneys (siteTourneyNo, tourneyTypeId)"""
if db_server == 'mysql':
self.query['addHandsIndex'] = """ALTER TABLE Hands ADD UNIQUE INDEX siteHandNo(siteHandNo, gameTypeId)"""
elif db_server == 'postgresql':
self.query['addHandsIndex'] = """CREATE UNIQUE INDEX siteHandNo ON Hands (siteHandNo, gameTypeId)"""
elif db_server == 'sqlite':
self.query['addHandsIndex'] = """CREATE UNIQUE INDEX siteHandNo ON Hands (siteHandNo, gameTypeId)"""
if db_server == 'mysql':
self.query['addPlayersIndex'] = """ALTER TABLE Players ADD UNIQUE INDEX name(name, siteId)"""
elif db_server == 'postgresql':
self.query['addPlayersIndex'] = """CREATE UNIQUE INDEX name ON Players (name, siteId)"""
elif db_server == 'sqlite':
self.query['addPlayersIndex'] = """CREATE UNIQUE INDEX name ON Players (name, siteId)"""
if db_server == 'mysql':
self.query['addTPlayersIndex'] = """ALTER TABLE TourneysPlayers ADD UNIQUE INDEX tourneyId(tourneyId, playerId)"""
elif db_server == 'postgresql':
self.query['addTPlayersIndex'] = """CREATE UNIQUE INDEX tourneyId ON TourneysPlayers (tourneyId, playerId)"""
elif db_server == 'sqlite':
self.query['addTPlayersIndex'] = """CREATE UNIQUE INDEX tourneyId ON TourneysPlayers (tourneyId, playerId)"""
if db_server == 'mysql':
minor DB changes. recording TourneysPlayers now for FTP and PS
2010-07-07 00:52:44 +02:00
self.query['addTTypesIndex'] = """ALTER TABLE TourneyTypes ADD UNIQUE INDEX tourneytypes_all(siteId, buyin, fee
removed TourneyTypes.headsUp
2010-07-02 19:39:02 +02:00
, maxSeats, knockout, rebuy, addOn, speed, shootout, matrix, sng)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
elif db_server == 'postgresql':
minor DB changes. recording TourneysPlayers now for FTP and PS
2010-07-07 00:52:44 +02:00
self.query['addTTypesIndex'] = """CREATE UNIQUE INDEX tourneyTypes_all ON TourneyTypes (siteId, buyin, fee
removed TourneyTypes.headsUp
2010-07-02 19:39:02 +02:00
, maxSeats, knockout, rebuy, addOn, speed, shootout, matrix, sng)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
elif db_server == 'sqlite':
minor DB changes. recording TourneysPlayers now for FTP and PS
2010-07-07 00:52:44 +02:00
self.query['addTTypesIndex'] = """CREATE UNIQUE INDEX tourneyTypes_all ON TourneyTypes (siteId, buyin, fee
removed TourneyTypes.headsUp
2010-07-02 19:39:02 +02:00
, maxSeats, knockout, rebuy, addOn, speed, shootout, matrix, sng)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_last_hand'] = "select max(id) from Hands"
add date boundaries in filters
2010-10-12 21:34:06 +02:00
self.query['get_last_date'] = "SELECT MAX(startTime) FROM Hands"
self.query['get_first_date'] = "SELECT MIN(startTime) FROM Hands"
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_player_id'] = """
select Players.id AS player_id
from Players, Sites
where Players.name = %s
and Sites.name = %s
and Players.siteId = Sites.id
"""
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_player_names'] = """
select p.name
from Players p
where lower(p.name) like lower(%s)
and (p.siteId = %s or %s = -1)
"""
add dropdown to player name in filter
2009-10-05 23:12:35 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_stats_from_hand'] = """
SELECT hc.playerId AS player_id,
hp.seatNo AS seat,
p.name AS screen_name,
sum(hc.HDs) AS n,
sum(hc.street0VPI) AS vpip,
sum(hc.street0Aggr) AS pfr,
sum(hc.street0_3BChance) AS TB_opp_0,
sum(hc.street0_3BDone) AS TB_0,
sum(hc.street1Seen) AS saw_f,
sum(hc.street1Seen) AS saw_1,
sum(hc.street2Seen) AS saw_2,
sum(hc.street3Seen) AS saw_3,
sum(hc.street4Seen) AS saw_4,
sum(hc.sawShowdown) AS sd,
sum(hc.street1Aggr) AS aggr_1,
sum(hc.street2Aggr) AS aggr_2,
sum(hc.street3Aggr) AS aggr_3,
sum(hc.street4Aggr) AS aggr_4,
sum(hc.otherRaisedStreet1) AS was_raised_1,
sum(hc.otherRaisedStreet2) AS was_raised_2,
sum(hc.otherRaisedStreet3) AS was_raised_3,
sum(hc.otherRaisedStreet4) AS was_raised_4,
sum(hc.foldToOtherRaisedStreet1) AS f_freq_1,
sum(hc.foldToOtherRaisedStreet2) AS f_freq_2,
sum(hc.foldToOtherRaisedStreet3) AS f_freq_3,
sum(hc.foldToOtherRaisedStreet4) AS f_freq_4,
sum(hc.wonWhenSeenStreet1) AS w_w_s_1,
sum(hc.wonAtSD) AS wmsd,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
sum(case hc.position
when 'S' then hc.raiseFirstInChance
when '0' then hc.raiseFirstInChance
when '1' then hc.raiseFirstInChance
else 0
) AS steal_opp,
sum(case hc.position
when 'S' then hc.raisedFirstIn
when '0' then hc.raisedFirstIn
when '1' then hc.raisedFirstIn
else 0
) AS steal,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
sum(hc.foldSbToStealChance) AS SBstolen,
sum(hc.foldedSbToSteal) AS SBnotDef,
sum(hc.foldBbToStealChance) AS BBstolen,
sum(hc.foldedBbToSteal) AS BBnotDef,
sum(hc.street1CBChance) AS CB_opp_1,
sum(hc.street1CBDone) AS CB_1,
sum(hc.street2CBChance) AS CB_opp_2,
sum(hc.street2CBDone) AS CB_2,
sum(hc.street3CBChance) AS CB_opp_3,
sum(hc.street3CBDone) AS CB_3,
sum(hc.street4CBChance) AS CB_opp_4,
sum(hc.street4CBDone) AS CB_4,
sum(hc.foldToStreet1CBChance) AS f_cb_opp_1,
sum(hc.foldToStreet1CBDone) AS f_cb_1,
sum(hc.foldToStreet2CBChance) AS f_cb_opp_2,
sum(hc.foldToStreet2CBDone) AS f_cb_2,
sum(hc.foldToStreet3CBChance) AS f_cb_opp_3,
sum(hc.foldToStreet3CBDone) AS f_cb_3,
sum(hc.foldToStreet4CBChance) AS f_cb_opp_4,
sum(hc.foldToStreet4CBDone) AS f_cb_4,
sum(hc.totalProfit) AS net,
add bbper100 and BBper100 stats for HUD
2010-08-04 23:23:28 +02:00
sum(gt.bigblind) AS bigblind,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
sum(hc.street1CheckCallRaiseChance) AS ccr_opp_1,
sum(hc.street1CheckCallRaiseDone) AS ccr_1,
sum(hc.street2CheckCallRaiseChance) AS ccr_opp_2,
sum(hc.street2CheckCallRaiseDone) AS ccr_2,
sum(hc.street3CheckCallRaiseChance) AS ccr_opp_3,
sum(hc.street3CheckCallRaiseDone) AS ccr_3,
sum(hc.street4CheckCallRaiseChance) AS ccr_opp_4,
sum(hc.street4CheckCallRaiseDone) AS ccr_4
Street(x)Bet street(x)Calls were stored in (db.)handplayers. They were not yet available in (db.)hudchache. Using the Bets and Call, together with stree(x)Agression the aggression frequency and aggression factor can be calculated.
2010-06-10 21:00:30 +02:00
sum(hc.street0Calls) AS call_0,
sum(hc.street1Calls) AS call_1,
sum(hc.street2Calls) AS call_2,
sum(hc.street3Calls) AS call_3,
sum(hc.street4Calls) AS call_4,
sum(hc.street0Bets) AS bet_0,
sum(hc.street1Bets) AS bet_1,
sum(hc.street2Bets) AS bet_2,
sum(hc.street3Bets) AS bet_3,
Street(x)Bet and street(x)Call and Street(x)Raises Now updates in hud chache also
2010-06-11 20:33:08 +02:00
sum(hc.street4Bets) AS bet_4,
sum(hc.street0Raises) AS raise_0,
sum(hc.street1Raises) AS raise_1,
sum(hc.street2Raises) AS raise_2,
sum(hc.street3Raises) AS raise_3,
sum(hc.street4Raises) AS raise_4
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
FROM Hands h
INNER JOIN HandsPlayers hp ON (hp.handId = h.id)
INNER JOIN HudCache hc ON ( hc.PlayerId = hp.PlayerId+0
AND hc.gametypeId+0 = h.gametypeId+0)
INNER JOIN Players p ON (p.id = hp.PlayerId+0)
add bbper100 and BBper100 stats for HUD
2010-08-04 23:23:28 +02:00
INNER JOIN Gametypes gt ON (gt.id = hc.gametypeId)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
WHERE h.id = %s
AND hc.styleKey > %s
/* styleKey is currently 'd' (for date) followed by a yyyymmdd
date key. Set it to 0000000 or similar to get all records */
/* also check activeseats here even if only 3 groups eg 2-3/4-6/7+
e.g. could use a multiplier:
AND h.seats > X / 1.25 and hp.seats < X * 1.25
where X is the number of active players at the current table (and
1.25 would be a config value so user could change it)
*/
GROUP BY hc.PlayerId, hp.seatNo, p.name
fix bug with hud stats, must use ORDER BY in the selects
2009-12-05 22:59:42 +01:00
ORDER BY hc.PlayerId, hp.seatNo, p.name
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
"""
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
# same as above except stats are aggregated for all blind/limit levels
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_stats_from_hand_aggregated'] = """
add commented out 'explain query plan' to go with previous commit
2010-02-25 21:57:28 +01:00
/* explain query plan */
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
SELECT hc.playerId AS player_id,
max(case when hc.gametypeId = h.gametypeId
then hp.seatNo
else -1
end) AS seat,
p.name AS screen_name,
sum(hc.HDs) AS n,
sum(hc.street0VPI) AS vpip,
sum(hc.street0Aggr) AS pfr,
sum(hc.street0_3BChance) AS TB_opp_0,
sum(hc.street0_3BDone) AS TB_0,
sum(hc.street1Seen) AS saw_f,
sum(hc.street1Seen) AS saw_1,
sum(hc.street2Seen) AS saw_2,
sum(hc.street3Seen) AS saw_3,
sum(hc.street4Seen) AS saw_4,
sum(hc.sawShowdown) AS sd,
sum(hc.street1Aggr) AS aggr_1,
sum(hc.street2Aggr) AS aggr_2,
sum(hc.street3Aggr) AS aggr_3,
sum(hc.street4Aggr) AS aggr_4,
sum(hc.otherRaisedStreet1) AS was_raised_1,
sum(hc.otherRaisedStreet2) AS was_raised_2,
sum(hc.otherRaisedStreet3) AS was_raised_3,
sum(hc.otherRaisedStreet4) AS was_raised_4,
sum(hc.foldToOtherRaisedStreet1) AS f_freq_1,
sum(hc.foldToOtherRaisedStreet2) AS f_freq_2,
sum(hc.foldToOtherRaisedStreet3) AS f_freq_3,
sum(hc.foldToOtherRaisedStreet4) AS f_freq_4,
sum(hc.wonWhenSeenStreet1) AS w_w_s_1,
sum(hc.wonAtSD) AS wmsd,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
sum(hc.raiseFirstInChance) AS steal_opp,
sum(hc.raisedFirstIn) AS steal,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
sum(hc.foldSbToStealChance) AS SBstolen,
sum(hc.foldedSbToSteal) AS SBnotDef,
sum(hc.foldBbToStealChance) AS BBstolen,
sum(hc.foldedBbToSteal) AS BBnotDef,
sum(hc.street1CBChance) AS CB_opp_1,
sum(hc.street1CBDone) AS CB_1,
sum(hc.street2CBChance) AS CB_opp_2,
sum(hc.street2CBDone) AS CB_2,
sum(hc.street3CBChance) AS CB_opp_3,
sum(hc.street3CBDone) AS CB_3,
sum(hc.street4CBChance) AS CB_opp_4,
sum(hc.street4CBDone) AS CB_4,
sum(hc.foldToStreet1CBChance) AS f_cb_opp_1,
sum(hc.foldToStreet1CBDone) AS f_cb_1,
sum(hc.foldToStreet2CBChance) AS f_cb_opp_2,
sum(hc.foldToStreet2CBDone) AS f_cb_2,
sum(hc.foldToStreet3CBChance) AS f_cb_opp_3,
sum(hc.foldToStreet3CBDone) AS f_cb_3,
sum(hc.foldToStreet4CBChance) AS f_cb_opp_4,
sum(hc.foldToStreet4CBDone) AS f_cb_4,
sum(hc.totalProfit) AS net,
add bbper100 and BBper100 stats for HUD
2010-08-04 23:23:28 +02:00
sum(gt.bigblind) AS bigblind,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
sum(hc.street1CheckCallRaiseChance) AS ccr_opp_1,
sum(hc.street1CheckCallRaiseDone) AS ccr_1,
sum(hc.street2CheckCallRaiseChance) AS ccr_opp_2,
sum(hc.street2CheckCallRaiseDone) AS ccr_2,
sum(hc.street3CheckCallRaiseChance) AS ccr_opp_3,
sum(hc.street3CheckCallRaiseDone) AS ccr_3,
sum(hc.street4CheckCallRaiseChance) AS ccr_opp_4,
Street(x)Bet street(x)Calls were stored in (db.)handplayers. They were not yet available in (db.)hudchache. Using the Bets and Call, together with stree(x)Agression the aggression frequency and aggression factor can be calculated.
2010-06-10 21:00:30 +02:00
sum(hc.street4CheckCallRaiseDone) AS ccr_4,
sum(hc.street0Calls) AS call_0,
sum(hc.street1Calls) AS call_1,
sum(hc.street2Calls) AS call_2,
sum(hc.street3Calls) AS call_3,
sum(hc.street4Calls) AS call_4,
sum(hc.street0Bets) AS bet_0,
sum(hc.street1Bets) AS bet_1,
sum(hc.street2Bets) AS bet_2,
sum(hc.street3Bets) AS bet_3,
Street(x)Bet and street(x)Call and Street(x)Raises Now updates in hud chache also
2010-06-11 20:33:08 +02:00
sum(hc.street4Bets) AS bet_4,
sum(hc.street0Raises) AS raise_0,
sum(hc.street1Raises) AS raise_1,
sum(hc.street2Raises) AS raise_2,
sum(hc.street3Raises) AS raise_3,
sum(hc.street4Raises) AS raise_4
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
FROM Hands h
INNER JOIN HandsPlayers hp ON (hp.handId = h.id)
INNER JOIN HudCache hc ON (hc.playerId = hp.playerId)
INNER JOIN Players p ON (p.id = hc.playerId)
add bbper100 and BBper100 stats for HUD
2010-08-04 23:23:28 +02:00
INNER JOIN Gametypes gt ON (gt.id = hc.gametypeId)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
WHERE h.id = %s
AND ( /* 2 separate parts for hero and opponents */
( hp.playerId != %s
AND hc.styleKey > %s
AND hc.gametypeId+0 in
(SELECT gt1.id from Gametypes gt1, Gametypes gt2
WHERE gt1.siteid = gt2.siteid /* find gametypes where these match: */
AND gt1.type = gt2.type /* ring/tourney */
AND gt1.category = gt2.category /* holdem/stud*/
AND gt1.limittype = gt2.limittype /* fl/nl */
AND gt1.bigblind <= gt2.bigblind * %s /* bigblind similar size */
AND gt1.bigblind >= gt2.bigblind / %s
AND gt2.id = h.gametypeId)
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
AND hc.activeSeats between %s and %s
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
)
OR
( hp.playerId = %s
AND hc.styleKey > %s
AND hc.gametypeId+0 in
(SELECT gt1.id from Gametypes gt1, Gametypes gt2
WHERE gt1.siteid = gt2.siteid /* find gametypes where these match: */
AND gt1.type = gt2.type /* ring/tourney */
AND gt1.category = gt2.category /* holdem/stud*/
AND gt1.limittype = gt2.limittype /* fl/nl */
AND gt1.bigblind <= gt2.bigblind * %s /* bigblind similar size */
AND gt1.bigblind >= gt2.bigblind / %s
AND gt2.id = h.gametypeId)
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
AND hc.activeSeats between %s and %s
add separate hud config for user and allow some user config in HUD menu (opponents still only via editing HUD_main.py)
2009-09-29 00:59:17 +02:00
)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
)
GROUP BY hc.PlayerId, p.name
fix bug with hud stats, must use ORDER BY in the selects
2009-12-05 22:59:42 +01:00
ORDER BY hc.PlayerId, p.name
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
"""
# NOTES on above cursor:
# - Do NOT include %s inside query in a comment - the db api thinks
# they are actual arguments.
# - styleKey is currently 'd' (for date) followed by a yyyymmdd
# date key. Set it to 0000000 or similar to get all records
# Could also check activeseats here even if only 3 groups eg 2-3/4-6/7+
# e.g. could use a multiplier:
# AND h.seats > %s / 1.25 and hp.seats < %s * 1.25
# where %s is the number of active players at the current table (and
# 1.25 would be a config value so user could change it)
if db_server == 'mysql':
self.query['get_stats_from_hand_session'] = """
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
SELECT hp.playerId AS player_id, /* playerId and seats must */
h.seats AS seats, /* be first and second field */
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
hp.handId AS hand_id,
hp.seatNo AS seat,
p.name AS screen_name,
1 AS n,
cast(hp2.street0VPI as <signed>integer) AS vpip,
cast(hp2.street0Aggr as <signed>integer) AS pfr,
cast(hp2.street0_3BChance as <signed>integer) AS TB_opp_0,
cast(hp2.street0_3BDone as <signed>integer) AS TB_0,
cast(hp2.street1Seen as <signed>integer) AS saw_f,
cast(hp2.street1Seen as <signed>integer) AS saw_1,
cast(hp2.street2Seen as <signed>integer) AS saw_2,
cast(hp2.street3Seen as <signed>integer) AS saw_3,
cast(hp2.street4Seen as <signed>integer) AS saw_4,
cast(hp2.sawShowdown as <signed>integer) AS sd,
cast(hp2.street1Aggr as <signed>integer) AS aggr_1,
cast(hp2.street2Aggr as <signed>integer) AS aggr_2,
cast(hp2.street3Aggr as <signed>integer) AS aggr_3,
cast(hp2.street4Aggr as <signed>integer) AS aggr_4,
cast(hp2.otherRaisedStreet1 as <signed>integer) AS was_raised_1,
cast(hp2.otherRaisedStreet2 as <signed>integer) AS was_raised_2,
cast(hp2.otherRaisedStreet3 as <signed>integer) AS was_raised_3,
cast(hp2.otherRaisedStreet4 as <signed>integer) AS was_raised_4,
cast(hp2.foldToOtherRaisedStreet1 as <signed>integer) AS f_freq_1,
cast(hp2.foldToOtherRaisedStreet2 as <signed>integer) AS f_freq_2,
cast(hp2.foldToOtherRaisedStreet3 as <signed>integer) AS f_freq_3,
cast(hp2.foldToOtherRaisedStreet4 as <signed>integer) AS f_freq_4,
cast(hp2.wonWhenSeenStreet1 as <signed>integer) AS w_w_s_1,
cast(hp2.wonAtSD as <signed>integer) AS wmsd,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
cast(hp2.raiseFirstInChance as <signed>integer) AS steal_opp,
cast(hp2.raisedFirstIn as <signed>integer) AS steal,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
cast(hp2.foldSbToStealChance as <signed>integer) AS SBstolen,
cast(hp2.foldedSbToSteal as <signed>integer) AS SBnotDef,
cast(hp2.foldBbToStealChance as <signed>integer) AS BBstolen,
cast(hp2.foldedBbToSteal as <signed>integer) AS BBnotDef,
cast(hp2.street1CBChance as <signed>integer) AS CB_opp_1,
cast(hp2.street1CBDone as <signed>integer) AS CB_1,
cast(hp2.street2CBChance as <signed>integer) AS CB_opp_2,
cast(hp2.street2CBDone as <signed>integer) AS CB_2,
cast(hp2.street3CBChance as <signed>integer) AS CB_opp_3,
cast(hp2.street3CBDone as <signed>integer) AS CB_3,
cast(hp2.street4CBChance as <signed>integer) AS CB_opp_4,
cast(hp2.street4CBDone as <signed>integer) AS CB_4,
cast(hp2.foldToStreet1CBChance as <signed>integer) AS f_cb_opp_1,
cast(hp2.foldToStreet1CBDone as <signed>integer) AS f_cb_1,
cast(hp2.foldToStreet2CBChance as <signed>integer) AS f_cb_opp_2,
cast(hp2.foldToStreet2CBDone as <signed>integer) AS f_cb_2,
cast(hp2.foldToStreet3CBChance as <signed>integer) AS f_cb_opp_3,
cast(hp2.foldToStreet3CBDone as <signed>integer) AS f_cb_3,
cast(hp2.foldToStreet4CBChance as <signed>integer) AS f_cb_opp_4,
cast(hp2.foldToStreet4CBDone as <signed>integer) AS f_cb_4,
cast(hp2.totalProfit as <signed>integer) AS net,
add bbper100 and BBper100 stats for HUD
2010-08-04 23:23:28 +02:00
cast(gt.bigblind as <signed>integer) AS bigblind,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
cast(hp2.street1CheckCallRaiseChance as <signed>integer) AS ccr_opp_1,
cast(hp2.street1CheckCallRaiseDone as <signed>integer) AS ccr_1,
cast(hp2.street2CheckCallRaiseChance as <signed>integer) AS ccr_opp_2,
cast(hp2.street2CheckCallRaiseDone as <signed>integer) AS ccr_2,
cast(hp2.street3CheckCallRaiseChance as <signed>integer) AS ccr_opp_3,
cast(hp2.street3CheckCallRaiseDone as <signed>integer) AS ccr_3,
cast(hp2.street4CheckCallRaiseChance as <signed>integer) AS ccr_opp_4,
Street(x)Bet and street(x)Call and Street(x)Raises Now updates in hud chache also
2010-06-11 20:33:08 +02:00
cast(hp2.street4CheckCallRaiseDone as <signed>integer) AS ccr_4,
cast(hp2.street0Calls as <signed>integer) AS call_0,
cast(hp2.street1Calls as <signed>integer) AS call_1,
cast(hp2.street2Calls as <signed>integer) AS call_2,
cast(hp2.street3Calls as <signed>integer) AS call_3,
cast(hp2.street4Calls as <signed>integer) AS call_4,
cast(hp2.street0Bets as <signed>integer) AS bet_0,
cast(hp2.street1Bets as <signed>integer) AS bet_1,
cast(hp2.street2Bets as <signed>integer) AS bet_2,
cast(hp2.street3Bets as <signed>integer) AS bet_3,
cast(hp2.street4Bets as <signed>integer) AS bet_4,
cast(hp2.street0Raises as <signed>integer) AS raise_0,
cast(hp2.street1Raises as <signed>integer) AS raise_1,
cast(hp2.street2Raises as <signed>integer) AS raise_2,
cast(hp2.street3Raises as <signed>integer) AS raise_3,
cast(hp2.street4Raises as <signed>integer) AS raise_4
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
FROM
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
Hands h
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
INNER JOIN Hands h2 ON (h2.id > %s AND h2.tableName = h.tableName)
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
INNER JOIN HandsPlayers hp ON (h.id = hp.handId) /* players in this hand */
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
INNER JOIN HandsPlayers hp2 ON (hp2.playerId+0 = hp.playerId+0 AND (hp2.handId = h2.id+0)) /* other hands by these players */
INNER JOIN Players p ON (p.id = hp2.PlayerId+0)
add bbper100 and BBper100 stats for HUD
2010-08-04 23:23:28 +02:00
INNER JOIN Gametypes gt ON (gt.id = h2.gametypeId)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
WHERE hp.handId = %s
/* check activeseats once this data returned (don't want to do that here as it might
assume a session ended just because the number of seats dipped for a few hands)
*/
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
AND ( /* 2 separate parts for hero and opponents */
( hp2.playerId != %s
AND h2.seats between %s and %s
)
OR
( hp2.playerId = %s
AND h2.seats between %s and %s
)
)
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
ORDER BY h.startTime desc, hp2.PlayerId
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
/* order rows by handstart descending so that we can stop reading rows when
there's a gap over X minutes between hands (ie. when we get back to start of
the session */
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
"""
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
elif db_server == 'postgresql':
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_stats_from_hand_session'] = """
SELECT hp.playerId AS player_id,
hp.handId AS hand_id,
hp.seatNo AS seat,
p.name AS screen_name,
h.seats AS seats,
1 AS n,
cast(hp2.street0VPI as <signed>integer) AS vpip,
cast(hp2.street0Aggr as <signed>integer) AS pfr,
cast(hp2.street0_3BChance as <signed>integer) AS TB_opp_0,
cast(hp2.street0_3BDone as <signed>integer) AS TB_0,
cast(hp2.street1Seen as <signed>integer) AS saw_f,
cast(hp2.street1Seen as <signed>integer) AS saw_1,
cast(hp2.street2Seen as <signed>integer) AS saw_2,
cast(hp2.street3Seen as <signed>integer) AS saw_3,
cast(hp2.street4Seen as <signed>integer) AS saw_4,
cast(hp2.sawShowdown as <signed>integer) AS sd,
cast(hp2.street1Aggr as <signed>integer) AS aggr_1,
cast(hp2.street2Aggr as <signed>integer) AS aggr_2,
cast(hp2.street3Aggr as <signed>integer) AS aggr_3,
cast(hp2.street4Aggr as <signed>integer) AS aggr_4,
cast(hp2.otherRaisedStreet1 as <signed>integer) AS was_raised_1,
cast(hp2.otherRaisedStreet2 as <signed>integer) AS was_raised_2,
cast(hp2.otherRaisedStreet3 as <signed>integer) AS was_raised_3,
cast(hp2.otherRaisedStreet4 as <signed>integer) AS was_raised_4,
cast(hp2.foldToOtherRaisedStreet1 as <signed>integer) AS f_freq_1,
cast(hp2.foldToOtherRaisedStreet2 as <signed>integer) AS f_freq_2,
cast(hp2.foldToOtherRaisedStreet3 as <signed>integer) AS f_freq_3,
cast(hp2.foldToOtherRaisedStreet4 as <signed>integer) AS f_freq_4,
cast(hp2.wonWhenSeenStreet1 as <signed>integer) AS w_w_s_1,
cast(hp2.wonAtSD as <signed>integer) AS wmsd,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
cast(hp2.raiseFirstInChance as <signed>integer) AS steal_opp,
cast(hp2.raisedFirstIn as <signed>integer) AS steal,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
cast(hp2.foldSbToStealChance as <signed>integer) AS SBstolen,
cast(hp2.foldedSbToSteal as <signed>integer) AS SBnotDef,
cast(hp2.foldBbToStealChance as <signed>integer) AS BBstolen,
cast(hp2.foldedBbToSteal as <signed>integer) AS BBnotDef,
cast(hp2.street1CBChance as <signed>integer) AS CB_opp_1,
cast(hp2.street1CBDone as <signed>integer) AS CB_1,
cast(hp2.street2CBChance as <signed>integer) AS CB_opp_2,
cast(hp2.street2CBDone as <signed>integer) AS CB_2,
cast(hp2.street3CBChance as <signed>integer) AS CB_opp_3,
cast(hp2.street3CBDone as <signed>integer) AS CB_3,
cast(hp2.street4CBChance as <signed>integer) AS CB_opp_4,
cast(hp2.street4CBDone as <signed>integer) AS CB_4,
cast(hp2.foldToStreet1CBChance as <signed>integer) AS f_cb_opp_1,
cast(hp2.foldToStreet1CBDone as <signed>integer) AS f_cb_1,
cast(hp2.foldToStreet2CBChance as <signed>integer) AS f_cb_opp_2,
cast(hp2.foldToStreet2CBDone as <signed>integer) AS f_cb_2,
cast(hp2.foldToStreet3CBChance as <signed>integer) AS f_cb_opp_3,
cast(hp2.foldToStreet3CBDone as <signed>integer) AS f_cb_3,
cast(hp2.foldToStreet4CBChance as <signed>integer) AS f_cb_opp_4,
cast(hp2.foldToStreet4CBDone as <signed>integer) AS f_cb_4,
cast(hp2.totalProfit as <signed>integer) AS net,
add bbper100 and BBper100 stats for HUD
2010-08-04 23:23:28 +02:00
cast(gt.bigblind as <signed>integer) AS bigblind,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
cast(hp2.street1CheckCallRaiseChance as <signed>integer) AS ccr_opp_1,
cast(hp2.street1CheckCallRaiseDone as <signed>integer) AS ccr_1,
cast(hp2.street2CheckCallRaiseChance as <signed>integer) AS ccr_opp_2,
cast(hp2.street2CheckCallRaiseDone as <signed>integer) AS ccr_2,
cast(hp2.street3CheckCallRaiseChance as <signed>integer) AS ccr_opp_3,
cast(hp2.street3CheckCallRaiseDone as <signed>integer) AS ccr_3,
cast(hp2.street4CheckCallRaiseChance as <signed>integer) AS ccr_opp_4,
Street(x)Bet and street(x)Call and Street(x)Raises Now updates in hud chache also
2010-06-11 20:33:08 +02:00
cast(hp2.street4CheckCallRaiseDone as <signed>integer) AS ccr_4,
cast(hp2.street0Calls as <signed>integer) AS call_0,
cast(hp2.street1Calls as <signed>integer) AS call_1,
cast(hp2.street2Calls as <signed>integer) AS call_2,
cast(hp2.street3Calls as <signed>integer) AS call_3,
cast(hp2.street4Calls as <signed>integer) AS call_4,
cast(hp2.street0Bets as <signed>integer) AS bet_0,
cast(hp2.street1Bets as <signed>integer) AS bet_1,
cast(hp2.street2Bets as <signed>integer) AS bet_2,
cast(hp2.street3Bets as <signed>integer) AS bet_3,
cast(hp2.street4Bets as <signed>integer) AS bet_4,
cast(hp2.street0Raises as <signed>integer) AS raise_0,
cast(hp2.street1Raises as <signed>integer) AS raise_1,
cast(hp2.street2Raises as <signed>integer) AS raise_2,
cast(hp2.street3Raises as <signed>integer) AS raise_3,
cast(hp2.street4Raises as <signed>integer) AS raise_4
FROM Hands h /* this hand */
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
INNER JOIN Hands h2 ON ( h2.id > %s /* other hands */
AND h2.tableName = h.tableName)
INNER JOIN HandsPlayers hp ON (h.id = hp.handId) /* players in this hand */
INNER JOIN HandsPlayers hp2 ON ( hp2.playerId+0 = hp.playerId+0
AND hp2.handId = h2.id) /* other hands by these players */
INNER JOIN Players p ON (p.id = hp2.PlayerId+0)
add bbper100 and BBper100 stats for HUD
2010-08-04 23:23:28 +02:00
INNER JOIN Gametypes gt ON (gt.id = h2.gametypeId)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
WHERE h.id = %s
/* check activeseats once this data returned (don't want to do that here as it might
assume a session ended just because the number of seats dipped for a few hands)
*/
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
AND ( /* 2 separate parts for hero and opponents */
( hp2.playerId != %s
AND h2.seats between %s and %s
)
OR
( hp2.playerId = %s
AND h2.seats between %s and %s
)
)
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
ORDER BY h.startTime desc, hp2.PlayerId
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
/* order rows by handstart descending so that we can stop reading rows when
there's a gap over X minutes between hands (ie. when we get back to start of
the session */
"""
elif db_server == 'sqlite':
self.query['get_stats_from_hand_session'] = """
SELECT hp.playerId AS player_id,
hp.handId AS hand_id,
hp.seatNo AS seat,
p.name AS screen_name,
h.seats AS seats,
1 AS n,
cast(hp2.street0VPI as <signed>integer) AS vpip,
cast(hp2.street0Aggr as <signed>integer) AS pfr,
cast(hp2.street0_3BChance as <signed>integer) AS TB_opp_0,
cast(hp2.street0_3BDone as <signed>integer) AS TB_0,
cast(hp2.street1Seen as <signed>integer) AS saw_f,
cast(hp2.street1Seen as <signed>integer) AS saw_1,
cast(hp2.street2Seen as <signed>integer) AS saw_2,
cast(hp2.street3Seen as <signed>integer) AS saw_3,
cast(hp2.street4Seen as <signed>integer) AS saw_4,
cast(hp2.sawShowdown as <signed>integer) AS sd,
cast(hp2.street1Aggr as <signed>integer) AS aggr_1,
cast(hp2.street2Aggr as <signed>integer) AS aggr_2,
cast(hp2.street3Aggr as <signed>integer) AS aggr_3,
cast(hp2.street4Aggr as <signed>integer) AS aggr_4,
cast(hp2.otherRaisedStreet1 as <signed>integer) AS was_raised_1,
cast(hp2.otherRaisedStreet2 as <signed>integer) AS was_raised_2,
cast(hp2.otherRaisedStreet3 as <signed>integer) AS was_raised_3,
cast(hp2.otherRaisedStreet4 as <signed>integer) AS was_raised_4,
cast(hp2.foldToOtherRaisedStreet1 as <signed>integer) AS f_freq_1,
cast(hp2.foldToOtherRaisedStreet2 as <signed>integer) AS f_freq_2,
cast(hp2.foldToOtherRaisedStreet3 as <signed>integer) AS f_freq_3,
cast(hp2.foldToOtherRaisedStreet4 as <signed>integer) AS f_freq_4,
cast(hp2.wonWhenSeenStreet1 as <signed>integer) AS w_w_s_1,
cast(hp2.wonAtSD as <signed>integer) AS wmsd,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
cast(hp2.raiseFirstInChance as <signed>integer) AS steal_opp,
cast(hp2.raisedFirstIn as <signed>integer) AS steal,
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
cast(hp2.foldSbToStealChance as <signed>integer) AS SBstolen,
cast(hp2.foldedSbToSteal as <signed>integer) AS SBnotDef,
cast(hp2.foldBbToStealChance as <signed>integer) AS BBstolen,
cast(hp2.foldedBbToSteal as <signed>integer) AS BBnotDef,
cast(hp2.street1CBChance as <signed>integer) AS CB_opp_1,
cast(hp2.street1CBDone as <signed>integer) AS CB_1,
cast(hp2.street2CBChance as <signed>integer) AS CB_opp_2,
cast(hp2.street2CBDone as <signed>integer) AS CB_2,
cast(hp2.street3CBChance as <signed>integer) AS CB_opp_3,
cast(hp2.street3CBDone as <signed>integer) AS CB_3,
cast(hp2.street4CBChance as <signed>integer) AS CB_opp_4,
cast(hp2.street4CBDone as <signed>integer) AS CB_4,
cast(hp2.foldToStreet1CBChance as <signed>integer) AS f_cb_opp_1,
cast(hp2.foldToStreet1CBDone as <signed>integer) AS f_cb_1,
cast(hp2.foldToStreet2CBChance as <signed>integer) AS f_cb_opp_2,
cast(hp2.foldToStreet2CBDone as <signed>integer) AS f_cb_2,
cast(hp2.foldToStreet3CBChance as <signed>integer) AS f_cb_opp_3,
cast(hp2.foldToStreet3CBDone as <signed>integer) AS f_cb_3,
cast(hp2.foldToStreet4CBChance as <signed>integer) AS f_cb_opp_4,
cast(hp2.foldToStreet4CBDone as <signed>integer) AS f_cb_4,
cast(hp2.totalProfit as <signed>integer) AS net,
add bbper100 and BBper100 stats for HUD
2010-08-04 23:23:28 +02:00
cast(gt.bigblind as <signed>integer) AS bigblind,
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
cast(hp2.street1CheckCallRaiseChance as <signed>integer) AS ccr_opp_1,
cast(hp2.street1CheckCallRaiseDone as <signed>integer) AS ccr_1,
cast(hp2.street2CheckCallRaiseChance as <signed>integer) AS ccr_opp_2,
cast(hp2.street2CheckCallRaiseDone as <signed>integer) AS ccr_2,
cast(hp2.street3CheckCallRaiseChance as <signed>integer) AS ccr_opp_3,
cast(hp2.street3CheckCallRaiseDone as <signed>integer) AS ccr_3,
cast(hp2.street4CheckCallRaiseChance as <signed>integer) AS ccr_opp_4,
Street(x)Bet and street(x)Call and Street(x)Raises Now updates in hud chache also
2010-06-11 20:33:08 +02:00
cast(hp2.street4CheckCallRaiseDone as <signed>integer) AS ccr_4,
cast(hp2.street0Calls as <signed>integer) AS call_0,
cast(hp2.street1Calls as <signed>integer) AS call_1,
cast(hp2.street2Calls as <signed>integer) AS call_2,
cast(hp2.street3Calls as <signed>integer) AS call_3,
cast(hp2.street4Calls as <signed>integer) AS call_4,
cast(hp2.street0Bets as <signed>integer) AS bet_0,
cast(hp2.street1Bets as <signed>integer) AS bet_1,
cast(hp2.street2Bets as <signed>integer) AS bet_2,
cast(hp2.street3Bets as <signed>integer) AS bet_3,
cast(hp2.street4Bets as <signed>integer) AS bet_4,
cast(hp2.street0Raises as <signed>integer) AS raise_0,
cast(hp2.street1Raises as <signed>integer) AS raise_1,
cast(hp2.street2Raises as <signed>integer) AS raise_2,
cast(hp2.street3Raises as <signed>integer) AS raise_3,
cast(hp2.street4Raises as <signed>integer) AS raise_4
FROM Hands h /* this hand */
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
INNER JOIN Hands h2 ON ( h2.id > %s /* other hands */
AND h2.tableName = h.tableName)
INNER JOIN HandsPlayers hp ON (h.id = hp.handId) /* players in this hand */
INNER JOIN HandsPlayers hp2 ON ( hp2.playerId+0 = hp.playerId+0
AND hp2.handId = h2.id) /* other hands by these players */
INNER JOIN Players p ON (p.id = hp2.PlayerId+0)
add bbper100 and BBper100 stats for HUD
2010-08-04 23:23:28 +02:00
INNER JOIN Gametypes gt ON (gt.id = h2.gametypeId)
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
WHERE h.id = %s
/* check activeseats once this data returned (don't want to do that here as it might
assume a session ended just because the number of seats dipped for a few hands)
*/
AND ( /* 2 separate parts for hero and opponents */
( hp2.playerId != %s
AND h2.seats between %s and %s
)
OR
( hp2.playerId = %s
AND h2.seats between %s and %s
)
)
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
ORDER BY h.startTime desc, hp2.PlayerId
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
/* order rows by handstart descending so that we can stop reading rows when
there's a gap over X minutes between hands (ie. when we get back to start of
the session */
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_players_from_hand'] = """
SELECT HandsPlayers.playerId, seatNo, name
FROM HandsPlayers INNER JOIN Players ON (HandsPlayers.playerId = Players.id)
WHERE handId = %s
"""
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
# WHERE handId = %s AND Players.id LIKE %s
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_winners_from_hand'] = """
SELECT name, winnings
FROM HandsPlayers, Players
WHERE winnings > 0
AND Players.id = HandsPlayers.playerId
AND handId = %s;
"""
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_table_name'] = """
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/SQL.py
2009-11-09 04:50:47 +01:00
SELECT h.tableName, h.maxSeats, gt.category, gt.type, s.id, s.name
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
, count(1) as numseats
FROM Hands h, Gametypes gt, Sites s, HandsPlayers hp
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/SQL.py
2009-11-09 04:50:47 +01:00
WHERE h.id = %s
AND gt.id = h.gametypeId
AND s.id = gt.siteID
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 22:28:05 +01:00
AND hp.handId = h.id
GROUP BY h.tableName, h.maxSeats, gt.category, gt.type, s.id, s.name
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
"""
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_actual_seat'] = """
select seatNo
from HandsPlayers
where HandsPlayers.handId = %s
and HandsPlayers.playerId = (select Players.id from Players
where Players.name = %s)
"""
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_cards'] = """
select
seatNo AS seat_number,
card1, /*card1Value, card1Suit, */
card2, /*card2Value, card2Suit, */
card3, /*card3Value, card3Suit, */
card4, /*card4Value, card4Suit, */
card5, /*card5Value, card5Suit, */
card6, /*card6Value, card6Suit, */
card7 /*card7Value, card7Suit */
from HandsPlayers, Players
where handID = %s and HandsPlayers.playerId = Players.id
order by seatNo
"""
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_common_cards'] = """
select
boardcard1,
boardcard2,
boardcard3,
boardcard4,
boardcard5
from Hands
where Id = %s
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
if db_server == 'mysql':
self.query['get_hand_1day_ago'] = """
select coalesce(max(id),0)
from Hands
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
where startTime < date_sub(utc_timestamp(), interval '1' day)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
elif db_server == 'postgresql':
self.query['get_hand_1day_ago'] = """
select coalesce(max(id),0)
from Hands
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
where startTime < now() at time zone 'UTC' - interval '1 day'"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
elif db_server == 'sqlite':
self.query['get_hand_1day_ago'] = """
select coalesce(max(id),0)
from Hands
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
where startTime < strftime('%J', 'now') - 1"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
# not used yet ...
# gets a date, would need to use handsplayers (not hudcache) to get exact hand Id
if db_server == 'mysql':
self.query['get_date_nhands_ago'] = """
reverted HudCache styleKey to include only YYMMDD - however, it now stores the d000000 date based off the tz & offset
2010-11-30 20:05:28 +01:00
select concat( 'd', date_format(max(h.startTime), '%Y%m%d') )
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
from (select hp.playerId
,coalesce(greatest(max(hp.handId)-%s,1),1) as maxminusx
from HandsPlayers hp
where hp.playerId = %s
group by hp.playerId) hp2
inner join HandsPlayers hp3 on ( hp3.handId <= hp2.maxminusx
and hp3.playerId = hp2.playerId)
inner join Hands h on (h.id = hp3.handId)
"""
elif db_server == 'postgresql':
self.query['get_date_nhands_ago'] = """
reverted HudCache styleKey to include only YYMMDD - however, it now stores the d000000 date based off the tz & offset
2010-11-30 20:05:28 +01:00
select 'd' || to_char(max(h3.startTime), 'YYMMDD')
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
from (select hp.playerId
,coalesce(greatest(max(hp.handId)-%s,1),1) as maxminusx
from HandsPlayers hp
where hp.playerId = %s
group by hp.playerId) hp2
inner join HandsPlayers hp3 on ( hp3.handId <= hp2.maxminusx
and hp3.playerId = hp2.playerId)
inner join Hands h on (h.id = hp3.handId)
"""
elif db_server == 'sqlite': # untested guess at query:
self.query['get_date_nhands_ago'] = """
reverted HudCache styleKey to include only YYMMDD - however, it now stores the d000000 date based off the tz & offset
2010-11-30 20:05:28 +01:00
select 'd' || strftime(max(h3.startTime), 'YYMMDD')
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
from (select hp.playerId
,coalesce(greatest(max(hp.handId)-%s,1),1) as maxminusx
from HandsPlayers hp
where hp.playerId = %s
group by hp.playerId) hp2
inner join HandsPlayers hp3 on ( hp3.handId <= hp2.maxminusx
and hp3.playerId = hp2.playerId)
inner join Hands h on (h.id = hp3.handId)
"""
rename GuiPlayerStats to GuiRingPlayerStats and Filters to RingFilters
2010-07-11 05:49:58 +02:00
# used in Gui*PlayerStats:
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['getPlayerId'] = """SELECT id from Players where name = %s"""
self.query['getPlayerIdBySite'] = """SELECT id from Players where name = %s AND siteId = %s"""
rename GuiPlayerStats to GuiRingPlayerStats and Filters to RingFilters
2010-07-11 05:49:58 +02:00
# used in *Filters:
comment out duplicate query
2010-07-12 08:13:09 +02:00
#self.query['getLimits'] = already defined further up
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['getLimits2'] = """SELECT DISTINCT type, limitType, bigBlind
from Gametypes
ORDER by type, limitType DESC, bigBlind DESC"""
oops! missed out SQL.py from last release
2010-02-01 08:59:09 +01:00
self.query['getLimits3'] = """select DISTINCT type
make Filters work inspite of new tt.limitType
2010-07-12 08:17:36 +02:00
, gt.limitType
Fix grapher so that only cash limits show up
2010-07-12 10:19:01 +02:00
, case type
correct case in SQL
2010-02-01 09:22:14 +01:00
when 'ring' then bigBlind
Fix grapher so that only cash limits show up
2010-07-12 10:19:01 +02:00
- else buyin
- end as bb_or_buyin
correct case in SQL
2010-02-01 09:22:14 +01:00
from Gametypes gt
cross join TourneyTypes tt
another fix for the introduction of TT.limitType
2010-07-12 10:20:53 +02:00
order by type, gt.limitType DESC, bb_or_buyin DESC"""
Fix grapher so that only cash limits show up
2010-07-12 10:19:01 +02:00
self.query['getCashLimits'] = """select DISTINCT type
, limitType
, bigBlind as bb_or_buyin
from Gametypes gt
Filters: fix SQL query to only return ring game blind levels
2010-08-05 11:18:43 +02:00
WHERE type = 'ring'
Fix grapher so that only cash limits show up
2010-07-12 10:19:01 +02:00
order by type, limitType DESC, bb_or_buyin DESC"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
if db_server == 'mysql':
self.query['playerDetailedStats'] = """
select <hgameTypeId> AS hgametypeid
,<playerName> AS pname
,gt.base
,gt.category
,upper(gt.limitType) AS limittype
,s.name
,min(gt.bigBlind) AS minbigblind
,max(gt.bigBlind) AS maxbigblind
/*,<hcgametypeId> AS gtid*/
,<position> AS plposition
,count(1) AS n
,100.0*sum(cast(hp.street0VPI as <signed>integer))/count(1) AS vpip
,100.0*sum(cast(hp.street0Aggr as <signed>integer))/count(1) AS pfr
,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
end AS pf3
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,case when sum(cast(hp.raiseFirstInChance as <signed>integer)) = 0 then -999
else 100.0 * sum(cast(hp.raisedFirstIn as <signed>integer)) /
sum(cast(hp.raiseFirstInChance as <signed>integer))
end AS rfi
,case when sum(case hp.position
when 'S' then cast(hp.raiseFirstInChance as <signed>integer)
when '0' then cast(hp.raiseFirstInChance as <signed>integer)
when '1' then cast(hp.raiseFirstInChance as <signed>integer)
else 0
end
) = 0 then -999
else 100.0 *
sum(case hp.position
when 'S' then cast(hp.raisedFirstIn as <signed>integer)
when '0' then cast(hp.raisedFirstIn as <signed>integer)
when '1' then cast(hp.raisedFirstIn as <signed>integer)
else 0
end
) /
sum(case hp.position
when 'S' then cast(hp.raiseFirstInChance as <signed>integer)
when '0' then cast(hp.raiseFirstInChance as <signed>integer)
when '1' then cast(hp.raiseFirstInChance as <signed>integer)
else 0
end
)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
end AS steals
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,100.0*sum(cast(hp.street1Seen as <signed>integer))/count(1) AS saw_f
,100.0*sum(cast(hp.sawShowdown as <signed>integer))/count(1) AS sawsd
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.sawShowdown as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
end AS wtsdwsf
,case when sum(cast(hp.sawShowdown as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.wonAtSD as <signed>integer))/sum(cast(hp.sawShowdown as <signed>integer))
end AS wmsd
,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street1Aggr as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
end AS flafq
,case when sum(cast(hp.street2Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street2Aggr as <signed>integer))/sum(cast(hp.street2Seen as <signed>integer))
end AS tuafq
,case when sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street3Aggr as <signed>integer))/sum(cast(hp.street3Seen as <signed>integer))
end AS rvafq
,case when sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
else 100.0*(sum(cast(hp.street1Aggr as <signed>integer))+sum(cast(hp.street2Aggr as <signed>integer))+sum(cast(hp.street3Aggr as <signed>integer)))
/(sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)))
end AS pofafq
Added aggression information in guiplayerstats
2010-06-20 09:58:34 +02:00
,case when sum(cast(hp.street1Calls as <signed>integer))+ sum(cast(hp.street2Calls as <signed>integer))+ sum(cast(hp.street3Calls as <signed>integer))+ sum(cast(hp.street4Calls as <signed>integer)) = 0 then -999
else (sum(cast(hp.street1Aggr as <signed>integer)) + sum(cast(hp.street2Aggr as <signed>integer)) + sum(cast(hp.street3Aggr as <signed>integer)) + sum(cast(hp.street4Aggr as <signed>integer)))
/(sum(cast(hp.street1Calls as <signed>integer))+ sum(cast(hp.street2Calls as <signed>integer))+ sum(cast(hp.street3Calls as <signed>integer))+ sum(cast(hp.street4Calls as <signed>integer)))
end AS aggfac
,100.0*(sum(cast(hp.street1Aggr as <signed>integer)) + sum(cast(hp.street2Aggr as <signed>integer)) + sum(cast(hp.street3Aggr as <signed>integer)) + sum(cast(hp.street4Aggr as <signed>integer)))
/ ((sum(cast(hp.foldToOtherRaisedStreet1 as <signed>integer))+ sum(cast(hp.foldToOtherRaisedStreet2 as <signed>integer))+ sum(cast(hp.foldToOtherRaisedStreet3 as <signed>integer))+ sum(cast(hp.foldToOtherRaisedStreet4 as <signed>integer))) +
(sum(cast(hp.street1Calls as <signed>integer))+ sum(cast(hp.street2Calls as <signed>integer))+ sum(cast(hp.street3Calls as <signed>integer))+ sum(cast(hp.street4Calls as <signed>integer))) +
(sum(cast(hp.street1Aggr as <signed>integer)) + sum(cast(hp.street2Aggr as <signed>integer)) + sum(cast(hp.street3Aggr as <signed>integer)) + sum(cast(hp.street4Aggr as <signed>integer))) )
AS aggfrq
,100.0*(sum(cast(hp.street1CBDone as <signed>integer)) + sum(cast(hp.street2CBDone as <signed>integer)) + sum(cast(hp.street2CBDone as <signed>integer)) + sum(cast(hp.street4CBDone as <signed>integer)))
/ (sum(cast(hp.street1CBChance as <signed>integer))+ sum(cast(hp.street2CBChance as <signed>integer))+ sum(cast(hp.street3CBChance as <signed>integer))+ sum(cast(hp.street4CBChance as <signed>integer)))
AS conbet
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(hp.totalProfit)/100.0 AS net
,sum(hp.rake)/100.0 AS rake
,100.0*avg(hp.totalProfit/(gt.bigBlind+0.0)) AS bbper100
,avg(hp.totalProfit)/100.0 AS profitperhand
,100.0*avg((hp.totalProfit+hp.rake)/(gt.bigBlind+0.0)) AS bb100xr
,avg((hp.totalProfit+hp.rake)/100.0) AS profhndxr
,avg(h.seats+0.0) AS avgseats
,variance(hp.totalProfit/100.0) AS variance
from HandsPlayers hp
inner join Hands h on (h.id = hp.handId)
inner join Gametypes gt on (gt.Id = h.gameTypeId)
inner join Sites s on (s.Id = gt.siteId)
inner join Players p on (p.Id = hp.playerId)
where hp.playerId in <player_test>
added a game selector to the player stats.
2010-01-20 18:27:11 +01:00
<game_test>
When all players are selected in player stats The site filter settings were bypassed. This fix only selects all players from selected sites
2010-02-23 18:55:09 +01:00
<site_test>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
/*and hp.tourneysPlayersId IS NULL*/
and h.seats <seats_test>
<flagtest>
<gtbigBlind_test>
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
and date_format(h.startTime, '%Y-%m-%d %T') <datestest>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
group by hgameTypeId
,pname
,gt.base
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
,gt.category
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
<groupbyseats>
,plposition
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
,upper(gt.limitType)
,s.name
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
having 1 = 1 <havingclause>
order by pname
,gt.base
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
,gt.category
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
<orderbyseats>
,case <position> when 'B' then 'B'
when 'S' then 'S'
else concat('Z', <position>)
end
<orderbyhgameTypeId>
,upper(gt.limitType) desc
,maxbigblind desc
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
,s.name
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
"""
elif db_server == 'postgresql':
self.query['playerDetailedStats'] = """
select <hgameTypeId> AS hgametypeid
,<playerName> AS pname
,gt.base
,gt.category
,upper(gt.limitType) AS limittype
,s.name
,min(gt.bigBlind) AS minbigblind
,max(gt.bigBlind) AS maxbigblind
/*,<hcgametypeId> AS gtid*/
,<position> AS plposition
,count(1) AS n
,100.0*sum(cast(hp.street0VPI as <signed>integer))/count(1) AS vpip
,100.0*sum(cast(hp.street0Aggr as <signed>integer))/count(1) AS pfr
,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
end AS pf3
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,case when sum(cast(hp.raiseFirstInChance as <signed>integer)) = 0 then -999
else 100.0 * sum(cast(hp.raisedFirstIn as <signed>integer)) /
sum(cast(hp.raiseFirstInChance as <signed>integer))
end AS rfi
,case when sum(case hp.position
when 'S' then cast(hp.raiseFirstInChance as <signed>integer)
when '0' then cast(hp.raiseFirstInChance as <signed>integer)
when '1' then cast(hp.raiseFirstInChance as <signed>integer)
else 0
end
) = 0 then -999
else 100.0 *
sum(case hp.position
when 'S' then cast(hp.raisedFirstIn as <signed>integer)
when '0' then cast(hp.raisedFirstIn as <signed>integer)
when '1' then cast(hp.raisedFirstIn as <signed>integer)
else 0
end
) /
sum(case hp.position
when 'S' then cast(hp.raiseFirstInChance as <signed>integer)
when '0' then cast(hp.raiseFirstInChance as <signed>integer)
when '1' then cast(hp.raiseFirstInChance as <signed>integer)
else 0
end
)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
end AS steals
,100.0*sum(cast(hp.street1Seen as <signed>integer))/count(1) AS saw_f
,100.0*sum(cast(hp.sawShowdown as <signed>integer))/count(1) AS sawsd
,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.sawShowdown as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
end AS wtsdwsf
,case when sum(cast(hp.sawShowdown as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.wonAtSD as <signed>integer))/sum(cast(hp.sawShowdown as <signed>integer))
end AS wmsd
,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street1Aggr as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
end AS flafq
,case when sum(cast(hp.street2Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street2Aggr as <signed>integer))/sum(cast(hp.street2Seen as <signed>integer))
end AS tuafq
,case when sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street3Aggr as <signed>integer))/sum(cast(hp.street3Seen as <signed>integer))
end AS rvafq
,case when sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
else 100.0*(sum(cast(hp.street1Aggr as <signed>integer))+sum(cast(hp.street2Aggr as <signed>integer))+sum(cast(hp.street3Aggr as <signed>integer)))
/(sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)))
end AS pofafq
Added aggression information in guiplayerstats
2010-06-20 09:58:34 +02:00
,case when sum(cast(hp.street1Calls as <signed>integer))+ sum(cast(hp.street2Calls as <signed>integer))+ sum(cast(hp.street3Calls as <signed>integer))+ sum(cast(hp.street4Calls as <signed>integer)) = 0 then -999
else (sum(cast(hp.street1Aggr as <signed>integer)) + sum(cast(hp.street2Aggr as <signed>integer)) + sum(cast(hp.street3Aggr as <signed>integer)) + sum(cast(hp.street4Aggr as <signed>integer)))
/(sum(cast(hp.street1Calls as <signed>integer))+ sum(cast(hp.street2Calls as <signed>integer))+ sum(cast(hp.street3Calls as <signed>integer))+ sum(cast(hp.street4Calls as <signed>integer)))
end AS aggfac
,100.0*(sum(cast(hp.street1Aggr as <signed>integer)) + sum(cast(hp.street2Aggr as <signed>integer)) + sum(cast(hp.street3Aggr as <signed>integer)) + sum(cast(hp.street4Aggr as <signed>integer)))
/ ((sum(cast(hp.foldToOtherRaisedStreet1 as <signed>integer))+ sum(cast(hp.foldToOtherRaisedStreet2 as <signed>integer))+ sum(cast(hp.foldToOtherRaisedStreet3 as <signed>integer))+ sum(cast(hp.foldToOtherRaisedStreet4 as <signed>integer))) +
(sum(cast(hp.street1Calls as <signed>integer))+ sum(cast(hp.street2Calls as <signed>integer))+ sum(cast(hp.street3Calls as <signed>integer))+ sum(cast(hp.street4Calls as <signed>integer))) +
(sum(cast(hp.street1Aggr as <signed>integer)) + sum(cast(hp.street2Aggr as <signed>integer)) + sum(cast(hp.street3Aggr as <signed>integer)) + sum(cast(hp.street4Aggr as <signed>integer))) )
AS aggfrq
,100.0*(sum(cast(hp.street1CBDone as <signed>integer)) + sum(cast(hp.street2CBDone as <signed>integer)) + sum(cast(hp.street2CBDone as <signed>integer)) + sum(cast(hp.street4CBDone as <signed>integer)))
/ (sum(cast(hp.street1CBChance as <signed>integer))+ sum(cast(hp.street2CBChance as <signed>integer))+ sum(cast(hp.street3CBChance as <signed>integer))+ sum(cast(hp.street4CBChance as <signed>integer)))
AS conbet
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(hp.totalProfit)/100.0 AS net
,sum(hp.rake)/100.0 AS rake
,100.0*avg(hp.totalProfit/(gt.bigBlind+0.0)) AS bbper100
,avg(hp.totalProfit)/100.0 AS profitperhand
,100.0*avg((hp.totalProfit+hp.rake)/(gt.bigBlind+0.0)) AS bb100xr
,avg((hp.totalProfit+hp.rake)/100.0) AS profhndxr
,avg(h.seats+0.0) AS avgseats
,variance(hp.totalProfit/100.0) AS variance
from HandsPlayers hp
inner join Hands h on (h.id = hp.handId)
inner join Gametypes gt on (gt.Id = h.gameTypeId)
inner join Sites s on (s.Id = gt.siteId)
inner join Players p on (p.Id = hp.playerId)
where hp.playerId in <player_test>
added a game selector to the player stats.
2010-01-20 18:27:11 +01:00
<game_test>
When all players are selected in player stats The site filter settings were bypassed. This fix only selects all players from selected sites
2010-02-23 18:55:09 +01:00
<site_test>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
/*and hp.tourneysPlayersId IS NULL*/
and h.seats <seats_test>
<flagtest>
<gtbigBlind_test>
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
and to_char(h.startTime, 'YYYY-MM-DD HH24:MI:SS') <datestest>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
group by hgameTypeId
,pname
,gt.base
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
,gt.category
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
<groupbyseats>
,plposition
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
,upper(gt.limitType)
,s.name
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
having 1 = 1 <havingclause>
order by pname
,gt.base
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
,gt.category
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
<orderbyseats>
,case <position> when 'B' then 'B'
when 'S' then 'S'
when '0' then 'Y'
else 'Z'||<position>
end
<orderbyhgameTypeId>
,upper(gt.limitType) desc
,maxbigblind desc
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
,s.name
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
"""
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
elif db_server == 'sqlite':
self.query['playerDetailedStats'] = """
select <hgameTypeId> AS hgametypeid
fix some sqlite and unicode issues (thanks to Gerko)
2010-02-01 00:46:51 +01:00
,<playerName> AS pname
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
,gt.base
,gt.category AS category
,upper(gt.limitType) AS limittype
,s.name AS name
,min(gt.bigBlind) AS minbigblind
,max(gt.bigBlind) AS maxbigblind
/*,<hcgametypeId> AS gtid*/
,<position> AS plposition
,count(1) AS n
,100.0*sum(cast(hp.street0VPI as <signed>integer))/count(1) AS vpip
,100.0*sum(cast(hp.street0Aggr as <signed>integer))/count(1) AS pfr
,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
end AS pf3
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,case when sum(cast(hp.raiseFirstInChance as <signed>integer)) = 0 then -999
else 100.0 * sum(cast(hp.raisedFirstIn as <signed>integer)) /
sum(cast(hp.raiseFirstInChance as <signed>integer))
end AS rfi
,case when sum(case hp.position
when 'S' then cast(hp.raiseFirstInChance as <signed>integer)
when '0' then cast(hp.raiseFirstInChance as <signed>integer)
when '1' then cast(hp.raiseFirstInChance as <signed>integer)
else 0
end
) = 0 then -999
else 100.0 *
sum(case hp.position
when 'S' then cast(hp.raisedFirstIn as <signed>integer)
when '0' then cast(hp.raisedFirstIn as <signed>integer)
when '1' then cast(hp.raisedFirstIn as <signed>integer)
else 0
end
) /
sum(case hp.position
when 'S' then cast(hp.raiseFirstInChance as <signed>integer)
when '0' then cast(hp.raiseFirstInChance as <signed>integer)
when '1' then cast(hp.raiseFirstInChance as <signed>integer)
else 0
end
)
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
end AS steals
,100.0*sum(cast(hp.street1Seen as <signed>integer))/count(1) AS saw_f
,100.0*sum(cast(hp.sawShowdown as <signed>integer))/count(1) AS sawsd
,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.sawShowdown as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
end AS wtsdwsf
,case when sum(cast(hp.sawShowdown as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.wonAtSD as <signed>integer))/sum(cast(hp.sawShowdown as <signed>integer))
end AS wmsd
,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street1Aggr as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
end AS flafq
,case when sum(cast(hp.street2Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street2Aggr as <signed>integer))/sum(cast(hp.street2Seen as <signed>integer))
end AS tuafq
,case when sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
else 100.0*sum(cast(hp.street3Aggr as <signed>integer))/sum(cast(hp.street3Seen as <signed>integer))
end AS rvafq
,case when sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
else 100.0*(sum(cast(hp.street1Aggr as <signed>integer))+sum(cast(hp.street2Aggr as <signed>integer))+sum(cast(hp.street3Aggr as <signed>integer)))
/(sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)))
end AS pofafq
Added aggression information in guiplayerstats
2010-06-20 09:58:34 +02:00
,case when sum(cast(hp.street1Calls as <signed>integer))+ sum(cast(hp.street2Calls as <signed>integer))+ sum(cast(hp.street3Calls as <signed>integer))+ sum(cast(hp.street4Calls as <signed>integer)) = 0 then -999
else (sum(cast(hp.street1Aggr as <signed>integer)) + sum(cast(hp.street2Aggr as <signed>integer)) + sum(cast(hp.street3Aggr as <signed>integer)) + sum(cast(hp.street4Aggr as <signed>integer)))
/(sum(cast(hp.street1Calls as <signed>integer))+ sum(cast(hp.street2Calls as <signed>integer))+ sum(cast(hp.street3Calls as <signed>integer))+ sum(cast(hp.street4Calls as <signed>integer)))
end AS aggfac
,100.0*(sum(cast(hp.street1Aggr as <signed>integer)) + sum(cast(hp.street2Aggr as <signed>integer)) + sum(cast(hp.street3Aggr as <signed>integer)) + sum(cast(hp.street4Aggr as <signed>integer)))
/ ((sum(cast(hp.foldToOtherRaisedStreet1 as <signed>integer))+ sum(cast(hp.foldToOtherRaisedStreet2 as <signed>integer))+ sum(cast(hp.foldToOtherRaisedStreet3 as <signed>integer))+ sum(cast(hp.foldToOtherRaisedStreet4 as <signed>integer))) +
(sum(cast(hp.street1Calls as <signed>integer))+ sum(cast(hp.street2Calls as <signed>integer))+ sum(cast(hp.street3Calls as <signed>integer))+ sum(cast(hp.street4Calls as <signed>integer))) +
(sum(cast(hp.street1Aggr as <signed>integer)) + sum(cast(hp.street2Aggr as <signed>integer)) + sum(cast(hp.street3Aggr as <signed>integer)) + sum(cast(hp.street4Aggr as <signed>integer))) )
AS aggfrq
,100.0*(sum(cast(hp.street1CBDone as <signed>integer)) + sum(cast(hp.street2CBDone as <signed>integer)) + sum(cast(hp.street2CBDone as <signed>integer)) + sum(cast(hp.street4CBDone as <signed>integer)))
/ (sum(cast(hp.street1CBChance as <signed>integer))+ sum(cast(hp.street2CBChance as <signed>integer))+ sum(cast(hp.street3CBChance as <signed>integer))+ sum(cast(hp.street4CBChance as <signed>integer)))
AS conbet
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
,sum(hp.totalProfit)/100.0 AS net
,sum(hp.rake)/100.0 AS rake
,100.0*avg(hp.totalProfit/(gt.bigBlind+0.0)) AS bbper100
,avg(hp.totalProfit)/100.0 AS profitperhand
,100.0*avg((hp.totalProfit+hp.rake)/(gt.bigBlind+0.0)) AS bb100xr
,avg((hp.totalProfit+hp.rake)/100.0) AS profhndxr
,avg(h.seats+0.0) AS avgseats
Re-enable 'variance' for sqlite.
2010-03-05 04:55:00 +01:00
,variance(hp.totalProfit/100.0) AS variance
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
from HandsPlayers hp
inner join Hands h on (h.id = hp.handId)
inner join Gametypes gt on (gt.Id = h.gameTypeId)
inner join Sites s on (s.Id = gt.siteId)
fix some sqlite and unicode issues (thanks to Gerko)
2010-02-01 00:46:51 +01:00
inner join Players p on (p.Id = hp.playerId)
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
where hp.playerId in <player_test>
added a game selector to the player stats.
2010-01-20 18:27:11 +01:00
<game_test>
When all players are selected in player stats The site filter settings were bypassed. This fix only selects all players from selected sites
2010-02-23 18:55:09 +01:00
<site_test>
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
/*and hp.tourneysPlayersId IS NULL*/
and h.seats <seats_test>
<flagtest>
<gtbigBlind_test>
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
and datetime(h.startTime) <datestest>
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
group by hgameTypeId
,hp.playerId
,gt.base
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
,gt.category
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
<groupbyseats>
,plposition
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
,upper(gt.limitType)
,s.name
add having clause to sqlite version of guistats query
2010-03-08 23:31:07 +01:00
having 1 = 1 <havingclause>
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
order by hp.playerId
,gt.base
,gt.category
<orderbyseats>
,case <position> when 'B' then 'B'
when 'S' then 'S'
when '0' then 'Y'
else 'Z'||<position>
end
<orderbyhgameTypeId>
,upper(gt.limitType) desc
fix a merge problem and replace to_char() for sqlite, player stats now working in sqlite :-)
2009-11-19 23:19:41 +01:00
,max(gt.bigBlind) desc
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,s.name
"""
intermediate commit for tourney stats
2010-07-10 22:24:32 +02:00
if db_server == 'mysql':
self.query['tourneyPlayerDetailedStats'] = """
display 1st/2nd/3rd in tourney player stats
2010-07-11 03:42:48 +02:00
select s.name AS siteName
,t.tourneyTypeId AS tourneyTypeId
TPS displays currency and fee now
2010-07-11 05:28:43 +02:00
,tt.currency AS currency
Tourney Player Viewer fix for Bugid 0000050 SQL case statements only divided by 100 if the currency was USD. This is a temporary fix - what we probably want is WHEN tt.currency != PLAY or FPP
2010-12-03 05:34:58 +01:00
,(CASE
WHEN tt.currency = 'USD' THEN tt.buyIn/100.0
WHEN tt.currency = 'EUR' THEN tt.buyIn/100.0
ELSE tt.buyIn
END) AS buyIn
TPS displays currency and fee now
2010-07-11 05:28:43 +02:00
,tt.fee/100.0 AS fee
TPS: display limitType and category
2010-07-13 20:21:05 +02:00
,tt.category AS category
,tt.limitType AS limitType
intermediate commit for tourney stats
2010-07-10 22:24:32 +02:00
,p.name AS playerName
fix formatting and add tourneycount to TPS
2010-07-11 04:59:31 +02:00
,COUNT(1) AS tourneyCount
TPS displays ITM%
2010-07-11 05:11:43 +02:00
,SUM(CASE WHEN tp.rank > 0 THEN 0 ELSE 1 END) AS unknownRank
,SUM(CASE WHEN winnings > 0 THEN 1 ELSE 0 END)/(COUNT(1) - SUM(CASE WHEN tp.rank > 0 THEN 0 ELSE 1 END)) AS itm
get tourney stats working for sqlite and pg (pg display still dodgy, think gui is mangling some fields somehow, e.g. sitename)
2010-08-12 23:15:44 +02:00
,SUM(CASE WHEN rank = 1 THEN 1 ELSE 0 END) AS _1st
,SUM(CASE WHEN rank = 2 THEN 1 ELSE 0 END) AS _2nd
,SUM(CASE WHEN rank = 3 THEN 1 ELSE 0 END) AS _3rd
TPS displays ROI%
2010-07-11 05:22:36 +02:00
,SUM(tp.winnings)/100.0 AS won
get tourney stats working for sqlite and pg (pg display still dodgy, think gui is mangling some fields somehow, e.g. sitename)
2010-08-12 23:15:44 +02:00
,SUM(CASE WHEN tt.currency = 'USD' THEN (tt.buyIn+tt.fee)/100.0 ELSE tt.buyIn END) AS spent
TPS displays profit/tourney
2010-07-11 05:35:41 +02:00
,SUM(tp.winnings)/SUM(tt.buyin+tt.fee)*100.0-100 AS roi
,SUM(tp.winnings-(tt.buyin+tt.fee))/100.0/(COUNT(1)-SUM(CASE WHEN tp.rank > 0 THEN 0 ELSE 1 END)) AS profitPerTourney
intermediate commit for tourney stats
2010-07-10 22:24:32 +02:00
from TourneysPlayers tp
inner join Tourneys t on (t.id = tp.tourneyId)
inner join TourneyTypes tt on (tt.Id = t.tourneyTypeId)
tourney query returns key information - now just need to display it
2010-07-10 23:21:36 +02:00
inner join Sites s on (s.Id = tt.siteId)
intermediate commit for tourney stats
2010-07-10 22:24:32 +02:00
inner join Players p on (p.Id = tp.playerId)
where tp.playerId in <nametest> <sitetest>
and date_format(t.startTime, '%Y-%m-%d %T') <datestest>
group by tourneyTypeId, playerName
order by tourneyTypeId
tourney query returns key information - now just need to display it
2010-07-10 23:21:36 +02:00
,playerName
,siteName"""
intermediate commit for tourney stats
2010-07-10 22:24:32 +02:00
elif db_server == 'postgresql':
get tourney stats working for sqlite and pg (pg display still dodgy, think gui is mangling some fields somehow, e.g. sitename)
2010-08-12 23:15:44 +02:00
# sc: itm and profitPerTourney changed to "ELSE 0" to avoid divide by zero error as temp fix
# proper fix should use coalesce() or case ... when ... to work in all circumstances
self.query['tourneyPlayerDetailedStats'] = """
select s.name AS siteName
,t.tourneyTypeId AS tourneyTypeId
,tt.currency AS currency
Tourney Player Viewer fix for Bugid 0000050 SQL case statements only divided by 100 if the currency was USD. This is a temporary fix - what we probably want is WHEN tt.currency != PLAY or FPP
2010-12-03 05:34:58 +01:00
,(CASE
WHEN tt.currency = 'USD' THEN tt.buyIn/100.0
WHEN tt.currency = 'EUR' THEN tt.buyIn/100.0
ELSE tt.buyIn
END) AS buyIn
get tourney stats working for sqlite and pg (pg display still dodgy, think gui is mangling some fields somehow, e.g. sitename)
2010-08-12 23:15:44 +02:00
,tt.fee/100.0 AS fee
,tt.category AS category
,tt.limitType AS limitType
,p.name AS playerName
,COUNT(1) AS tourneyCount
,SUM(CASE WHEN tp.rank > 0 THEN 0 ELSE 1 END) AS unknownRank
,SUM(CASE WHEN winnings > 0 THEN 1 ELSE 0 END)
/(COUNT(1) - SUM(CASE WHEN tp.rank > 0 THEN 0 ELSE 0 END)) AS itm
,SUM(CASE WHEN rank = 1 THEN 1 ELSE 0 END) AS _1st
,SUM(CASE WHEN rank = 2 THEN 1 ELSE 0 END) AS _2nd
,SUM(CASE WHEN rank = 3 THEN 1 ELSE 0 END) AS _3rd
,SUM(tp.winnings)/100.0 AS won
,SUM(CASE WHEN tt.currency = 'USD' THEN (tt.buyIn+tt.fee)/100.0 ELSE tt.buyIn END) AS spent
,SUM(tp.winnings)/SUM(tt.buyin+tt.fee)*100.0-100 AS roi
,SUM(tp.winnings-(tt.buyin+tt.fee))/100.0
/(COUNT(1)-SUM(CASE WHEN tp.rank > 0 THEN 0 ELSE 0 END)) AS profitPerTourney
from TourneysPlayers tp
inner join Tourneys t on (t.id = tp.tourneyId)
inner join TourneyTypes tt on (tt.Id = t.tourneyTypeId)
inner join Sites s on (s.Id = tt.siteId)
inner join Players p on (p.Id = tp.playerId)
where tp.playerId in <nametest> <sitetest>
and to_char(t.startTime, 'YYYY-MM-DD HH24:MI:SS') <datestest>
group by tourneyTypeId, s.name, playerName, tt.currency, tt.buyin, tt.fee
, tt.category, tt.limitType
order by tourneyTypeId
,playerName
,siteName"""
intermediate commit for tourney stats
2010-07-10 22:24:32 +02:00
elif db_server == 'sqlite':
get tourney stats working for sqlite and pg (pg display still dodgy, think gui is mangling some fields somehow, e.g. sitename)
2010-08-12 23:15:44 +02:00
self.query['tourneyPlayerDetailedStats'] = """
select s.name AS siteName
,t.tourneyTypeId AS tourneyTypeId
,tt.currency AS currency
Tourney Player Viewer fix for Bugid 0000050 SQL case statements only divided by 100 if the currency was USD. This is a temporary fix - what we probably want is WHEN tt.currency != PLAY or FPP
2010-12-03 05:34:58 +01:00
,(CASE
WHEN tt.currency = 'USD' THEN tt.buyIn/100.0
WHEN tt.currency = 'EUR' THEN tt.buyIn/100.0
ELSE tt.buyIn
END) AS buyIn
get tourney stats working for sqlite and pg (pg display still dodgy, think gui is mangling some fields somehow, e.g. sitename)
2010-08-12 23:15:44 +02:00
,tt.fee/100.0 AS fee
,tt.category AS category
,tt.limitType AS limitType
,p.name AS playerName
,COUNT(1) AS tourneyCount
,SUM(CASE WHEN tp.rank > 0 THEN 0 ELSE 1 END) AS unknownRank
,SUM(CASE WHEN winnings > 0 THEN 1 ELSE 0 END)/(COUNT(1) - SUM(CASE WHEN tp.rank > 0 THEN 0 ELSE 1 END)) AS itm
,SUM(CASE WHEN rank = 1 THEN 1 ELSE 0 END) AS _1st
,SUM(CASE WHEN rank = 2 THEN 1 ELSE 0 END) AS _2nd
,SUM(CASE WHEN rank = 3 THEN 1 ELSE 0 END) AS _3rd
,SUM(tp.winnings)/100.0 AS won
,SUM(CASE WHEN tt.currency = 'USD' THEN (tt.buyIn+tt.fee)/100.0 ELSE tt.buyIn END) AS spent
,SUM(tp.winnings)/SUM(tt.buyin+tt.fee)*100.0-100 AS roi
,SUM(tp.winnings-(tt.buyin+tt.fee))/100.0/(COUNT(1)-SUM(CASE WHEN tp.rank > 0 THEN 0 ELSE 1 END)) AS profitPerTourney
from TourneysPlayers tp
inner join Tourneys t on (t.id = tp.tourneyId)
inner join TourneyTypes tt on (tt.Id = t.tourneyTypeId)
inner join Sites s on (s.Id = tt.siteId)
inner join Players p on (p.Id = tp.playerId)
where tp.playerId in <nametest> <sitetest>
and datetime(t.startTime) <datestest>
group by tourneyTypeId, playerName
order by tourneyTypeId
,playerName
,siteName"""
intermediate commit for tourney stats
2010-07-10 22:24:32 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
if db_server == 'mysql':
self.query['playerStats'] = """
SELECT
concat(upper(stats.limitType), ' '
,concat(upper(substring(stats.category,1,1)),substring(stats.category,2) ), ' '
,stats.name, ' '
,cast(stats.bigBlindDesc as char)
) AS Game
,stats.n
,stats.vpip
,stats.pfr
,stats.pf3
,stats.steals
,stats.saw_f
,stats.sawsd
,stats.wtsdwsf
,stats.wmsd
,stats.FlAFq
,stats.TuAFq
,stats.RvAFq
,stats.PoFAFq
,stats.Net
,stats.BBper100
,stats.Profitperhand
,case when hprof2.variance = -999 then '-'
else format(hprof2.variance, 2)
end AS Variance
,stats.AvgSeats
FROM
(select /* stats from hudcache */
gt.base
,gt.category
,upper(gt.limitType) as limitType
,s.name
,<selectgt.bigBlind> AS bigBlindDesc
,<hcgametypeId> AS gtId
,sum(HDs) AS n
,format(100.0*sum(street0VPI)/sum(HDs),1) AS vpip
,format(100.0*sum(street0Aggr)/sum(HDs),1) AS pfr
,case when sum(street0_3Bchance) = 0 then '0'
else format(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),1)
end AS pf3
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,case when sum(raiseFirstInChance) = 0 then '-'
else format(100.0*sum(raisedFirstIn)/sum(raiseFirstInChance),1)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
end AS steals
,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 '-'
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
,format( sum(activeSeats*HDs)/(sum(HDs)+0.0), 2) AS AvgSeats
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>
and <gtbigBlind_test>
and hc.activeSeats <seats_test>
and concat( '20', substring(hc.styleKey,2,2), '-', substring(hc.styleKey,4,2), '-'
, substring(hc.styleKey,6,2) ) <datestest>
group by gt.base
,gt.category
,upper(gt.limitType)
,s.name
<groupbygt.bigBlind>
,gtId
) stats
inner join
( select # profit from handsplayers/handsactions
hprof.gtId, sum(hprof.profit) sum_profit,
avg(hprof.profit/100.0) profitperhand,
case when hprof.gtId = -1 then -999
else variance(hprof.profit/100.0)
end as variance
from
(select hp.handId, <hgameTypeId> as gtId, hp.totalProfit as profit
from HandsPlayers hp
inner join Hands h ON h.id = hp.handId
where hp.playerId in <player_test>
and hp.tourneysPlayersId IS NULL
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
and date_format(h.startTime, '%Y-%m-%d') <datestest>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
group by hp.handId, gtId, hp.totalProfit
) hprof
group by hprof.gtId
) hprof2
on hprof2.gtId = stats.gtId
order by stats.category, stats.limittype, stats.bigBlindDesc desc <orderbyseats>"""
minor cleanup
2010-07-27 17:43:47 +02:00
#elif db_server == 'sqlite': #TODO
# self.query['playerStats'] = """ """
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
else: # assume postgres
self.query['playerStats'] = """
SELECT upper(stats.limitType) || ' '
|| initcap(stats.category) || ' '
|| stats.name || ' '
|| stats.bigBlindDesc AS Game
,stats.n
,stats.vpip
,stats.pfr
,stats.pf3
,stats.steals
,stats.saw_f
,stats.sawsd
,stats.wtsdwsf
,stats.wmsd
,stats.FlAFq
,stats.TuAFq
,stats.RvAFq
,stats.PoFAFq
,stats.Net
,stats.BBper100
,stats.Profitperhand
,case when hprof2.variance = -999 then '-'
else to_char(hprof2.variance, '0D00')
end AS Variance
,AvgSeats
FROM
(select gt.base
,gt.category
,upper(gt.limitType) AS limitType
,s.name
,<selectgt.bigBlind> AS bigBlindDesc
,<hcgametypeId> AS gtId
,sum(HDs) as n
,to_char(100.0*sum(street0VPI)/sum(HDs),'990D0') AS vpip
,to_char(100.0*sum(street0Aggr)/sum(HDs),'90D0') AS pfr
,case when sum(street0_3Bchance) = 0 then '0'
else to_char(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),'90D0')
end AS pf3
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,case when sum(raiseFirstInChance) = 0 then '-'
else to_char(100.0*sum(raisedFirstIn)/sum(raiseFirstInChance),'90D0')
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
end AS steals
,to_char(100.0*sum(street1Seen)/sum(HDs),'90D0') AS saw_f
,to_char(100.0*sum(sawShowdown)/sum(HDs),'90D0') AS sawsd
,case when sum(street1Seen) = 0 then '-'
else to_char(100.0*sum(sawShowdown)/sum(street1Seen),'90D0')
end AS wtsdwsf
,case when sum(sawShowdown) = 0 then '-'
else to_char(100.0*sum(wonAtSD)/sum(sawShowdown),'90D0')
end AS wmsd
,case when sum(street1Seen) = 0 then '-'
else to_char(100.0*sum(street1Aggr)/sum(street1Seen),'90D0')
end AS FlAFq
,case when sum(street2Seen) = 0 then '-'
else to_char(100.0*sum(street2Aggr)/sum(street2Seen),'90D0')
end AS TuAFq
,case when sum(street3Seen) = 0 then '-'
else to_char(100.0*sum(street3Aggr)/sum(street3Seen),'90D0')
end AS RvAFq
,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then '-'
else to_char(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
/(sum(street1Seen)+sum(street2Seen)+sum(street3Seen)),'90D0')
end AS PoFAFq
,round(sum(totalProfit)/100.0,2) AS Net
,to_char((sum(totalProfit/(gt.bigBlind+0.0))) / (sum(HDs)/100.0), '990D00')
AS BBper100
,to_char(sum(totalProfit/100.0) / (sum(HDs)+0.0), '990D0000') AS Profitperhand
,to_char(sum(activeSeats*HDs)/(sum(HDs)+0.0),'90D00') AS AvgSeats
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>
and <gtbigBlind_test>
and hc.activeSeats <seats_test>
and '20' || SUBSTR(hc.styleKey,2,2) || '-' || SUBSTR(hc.styleKey,4,2) || '-'
|| SUBSTR(hc.styleKey,6,2) <datestest>
group by gt.base
,gt.category
,upper(gt.limitType)
,s.name
<groupbygt.bigBlind>
,gtId
) stats
inner join
( select
hprof.gtId, sum(hprof.profit) AS sum_profit,
avg(hprof.profit/100.0) AS profitperhand,
case when hprof.gtId = -1 then -999
else variance(hprof.profit/100.0)
end as variance
from
(select hp.handId, <hgameTypeId> as gtId, hp.totalProfit as profit
from HandsPlayers hp
inner join Hands h ON (h.id = hp.handId)
where hp.playerId in <player_test>
and hp.tourneysPlayersId IS NULL
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
and to_char(h.startTime, 'YYYY-MM-DD') <datestest>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
group by hp.handId, gtId, hp.totalProfit
) hprof
group by hprof.gtId
) hprof2
on hprof2.gtId = stats.gtId
order by stats.base, stats.limittype, stats.bigBlindDesc desc <orderbyseats>"""
if db_server == 'mysql':
self.query['playerStatsByPosition'] = """
SELECT
concat(upper(stats.limitType), ' '
,concat(upper(substring(stats.category,1,1)),substring(stats.category,2) ), ' '
,stats.name, ' '
,cast(stats.bigBlindDesc 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 'xx'
end AS PlPosition
,stats.n
,stats.vpip
,stats.pfr
,stats.pf3
,stats.steals
,stats.saw_f
,stats.sawsd
,stats.wtsdwsf
,stats.wmsd
,stats.FlAFq
,stats.TuAFq
,stats.RvAFq
,stats.PoFAFq
,stats.Net
,stats.BBper100
,stats.Profitperhand
,case when hprof2.variance = -999 then '-'
else format(hprof2.variance, 2)
end AS Variance
,stats.AvgSeats
FROM
(select /* stats from hudcache */
gt.base
,gt.category
,upper(gt.limitType) AS limitType
,s.name
,<selectgt.bigBlind> AS bigBlindDesc
,<hcgametypeId> AS gtId
,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
,case when sum(street0_3Bchance) = 0 then '0'
else format(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),1)
end AS pf3
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,case when sum(raiseFirstInChance) = 0 then '-'
else format(100.0*sum(raisedFirstIn)/sum(raiseFirstInChance),1)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
end AS steals
,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 '-'
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
,format( sum(activeSeats*HDs)/(sum(HDs)+0.0), 2) AS AvgSeats
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>
and <gtbigBlind_test>
and hc.activeSeats <seats_test>
and concat( '20', substring(hc.styleKey,2,2), '-', substring(hc.styleKey,4,2), '-'
, substring(hc.styleKey,6,2) ) <datestest>
group by gt.base
,gt.category
,upper(gt.limitType)
,s.name
<groupbygt.bigBlind>
,gtId
<groupbyseats>
,PlPosition
) stats
inner join
( select # profit from handsplayers/handsactions
hprof.gtId,
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,
case when hprof.gtId = -1 then -999
else variance(hprof.profit/100.0)
end as variance
from
(select hp.handId, <hgameTypeId> as gtId, hp.position
, hp.totalProfit as profit
from HandsPlayers hp
inner join Hands h ON (h.id = hp.handId)
where hp.playerId in <player_test>
and hp.tourneysPlayersId IS NULL
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
and date_format(h.startTime, '%Y-%m-%d') <datestest>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
group by hp.handId, gtId, hp.position, hp.totalProfit
) hprof
group by hprof.gtId, PlPosition
) hprof2
on ( hprof2.gtId = stats.gtId
and hprof2.PlPosition = stats.PlPosition)
order by stats.category, stats.limitType, stats.bigBlindDesc desc
<orderbyseats>, cast(stats.PlPosition as signed)
"""
add stub for query for positional stats on sqlite
2010-08-10 20:45:40 +02:00
elif db_server == 'sqlite':
self.query['playerStatsByPosition'] = ""#TODO
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
else: # assume postgresql
self.query['playerStatsByPosition'] = """
select /* stats from hudcache */
upper(stats.limitType) || ' '
|| upper(substr(stats.category,1,1)) || substr(stats.category,2) || ' '
|| stats.name || ' '
|| stats.bigBlindDesc 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 'xx'
end AS PlPosition
,stats.n
,stats.vpip
,stats.pfr
,stats.pf3
,stats.steals
,stats.saw_f
,stats.sawsd
,stats.wtsdwsf
,stats.wmsd
,stats.FlAFq
,stats.TuAFq
,stats.RvAFq
,stats.PoFAFq
,stats.Net
,stats.BBper100
,stats.Profitperhand
,case when hprof2.variance = -999 then '-'
else to_char(hprof2.variance, '0D00')
end AS Variance
,stats.AvgSeats
FROM
(select /* stats from hudcache */
gt.base
,gt.category
,upper(gt.limitType) AS limitType
,s.name
,<selectgt.bigBlind> AS bigBlindDesc
,<hcgametypeId> AS gtId
,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
,to_char(round(100.0*sum(street0VPI)/sum(HDs)),'990D0') AS vpip
,to_char(round(100.0*sum(street0Aggr)/sum(HDs)),'90D0') AS pfr
,case when sum(street0_3Bchance) = 0 then '0'
else to_char(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),'90D0')
end AS pf3
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,case when sum(raiseFirstInChance) = 0 then '-'
else to_char(100.0*sum(raisedFirstIn)/sum(raiseFirstInChance),'90D0')
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
end AS steals
,to_char(round(100.0*sum(street1Seen)/sum(HDs)),'90D0') AS saw_f
,to_char(round(100.0*sum(sawShowdown)/sum(HDs)),'90D0') AS sawsd
,case when sum(street1Seen) = 0 then '-'
else to_char(round(100.0*sum(sawShowdown)/sum(street1Seen)),'90D0')
end AS wtsdwsf
,case when sum(sawShowdown) = 0 then '-'
else to_char(round(100.0*sum(wonAtSD)/sum(sawShowdown)),'90D0')
end AS wmsd
,case when sum(street1Seen) = 0 then '-'
else to_char(round(100.0*sum(street1Aggr)/sum(street1Seen)),'90D0')
end AS FlAFq
,case when sum(street2Seen) = 0 then '-'
else to_char(round(100.0*sum(street2Aggr)/sum(street2Seen)),'90D0')
end AS TuAFq
,case when sum(street3Seen) = 0 then '-'
else to_char(round(100.0*sum(street3Aggr)/sum(street3Seen)),'90D0')
end AS RvAFq
,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then '-'
else to_char(round(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
/(sum(street1Seen)+sum(street2Seen)+sum(street3Seen))),'90D0')
end AS PoFAFq
,to_char(sum(totalProfit)/100.0,'9G999G990D00') AS Net
,case when sum(HDs) = 0 then '0'
else to_char(sum(totalProfit/(gt.bigBlind+0.0)) / (sum(HDs)/100.0), '990D00')
end AS BBper100
,case when sum(HDs) = 0 then '0'
else to_char( (sum(totalProfit)/100.0) / sum(HDs), '90D0000')
end AS Profitperhand
,to_char(sum(activeSeats*HDs)/(sum(HDs)+0.0),'90D00') AS AvgSeats
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>
and <gtbigBlind_test>
and hc.activeSeats <seats_test>
and '20' || SUBSTR(hc.styleKey,2,2) || '-' || SUBSTR(hc.styleKey,4,2) || '-'
|| SUBSTR(hc.styleKey,6,2) <datestest>
group by gt.base
,gt.category
,upper(gt.limitType)
,s.name
<groupbygt.bigBlind>
,gtId
<groupbyseats>
,PlPosition
) stats
inner join
( select /* profit from handsplayers/handsactions */
hprof.gtId,
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 cast(hprof.position as smallint)
end as PlPosition,
sum(hprof.profit) as sum_profit,
avg(hprof.profit/100.0) as profitperhand,
case when hprof.gtId = -1 then -999
else variance(hprof.profit/100.0)
end as variance
from
(select hp.handId, <hgameTypeId> as gtId, hp.position
, hp.totalProfit as profit
from HandsPlayers hp
inner join Hands h ON (h.id = hp.handId)
where hp.playerId in <player_test>
and hp.tourneysPlayersId IS NULL
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
and to_char(h.startTime, 'YYYY-MM-DD') <datestest>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
group by hp.handId, gameTypeId, hp.position, hp.totalProfit
) hprof
group by hprof.gtId, PlPosition
) hprof2
on ( hprof2.gtId = stats.gtId
and hprof2.PlPosition = stats.PlPosition)
order by stats.category, stats.limitType, stats.bigBlindDesc desc
<orderbyseats>, cast(stats.PlPosition as smallint)
"""
New: Tournament Results Viewer Decided to see how hard it would be to get the tournament results using the existing schema. Turns out the cash graph query is pretty similar and not much thought was required. Created a new tab based on the existing cash game viewer for profit. This is probably the idea page for multiple axis to be added. - Distributions for position - distributions by buy-in level - ROI per buy-in level Lots of stuff like that.
2010-09-04 08:16:46 +02:00
####################################
# Cash Game Graph query
####################################
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['getRingProfitAllHandsPlayerIdSite'] = """
Add showdown/non-showdown winnings to Grapher
2009-12-02 07:02:06 +01:00
SELECT hp.handId, hp.totalProfit, hp.sawShowdown
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
FROM HandsPlayers hp
INNER JOIN Players pl ON (pl.id = hp.playerId)
INNER JOIN Hands h ON (h.id = hp.handId)
INNER JOIN Gametypes gt ON (gt.id = h.gametypeId)
WHERE pl.id in <player_test>
AND pl.siteId in <site_test>
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
AND h.startTime > '<startdate_test>'
AND h.startTime < '<enddate_test>'
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
<limit_test>
game selector for graphs added. exception caught for games selector for player stats
2010-01-22 18:36:21 +01:00
<game_test>
fix broken graphing
2010-07-13 21:21:34 +02:00
AND gt.type = 'ring'
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
GROUP BY h.startTime, hp.handId, hp.sawShowdown, hp.totalProfit
ORDER BY h.startTime"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
Added graphing improvements.
2010-10-03 10:27:56 +02:00
self.query['getRingProfitAllHandsPlayerIdSiteInBB'] = """
SELECT hp.handId, ( hp.totalProfit / ( gt.bigBlind * 2 ) ) * 100 , hp.sawShowdown
FROM HandsPlayers hp
INNER JOIN Players pl ON (pl.id = hp.playerId)
INNER JOIN Hands h ON (h.id = hp.handId)
INNER JOIN Gametypes gt ON (gt.id = h.gametypeId)
WHERE pl.id in <player_test>
AND pl.siteId in <site_test>
AND h.startTime > '<startdate_test>'
AND h.startTime < '<enddate_test>'
<limit_test>
<game_test>
AND hp.tourneysPlayersId IS NULL
GROUP BY h.startTime, hp.handId, hp.sawShowdown, hp.totalProfit
ORDER BY h.startTime"""
self.query['getRingProfitAllHandsPlayerIdSiteInDollars'] = """
SELECT hp.handId, hp.totalProfit, hp.sawShowdown
FROM HandsPlayers hp
INNER JOIN Players pl ON (pl.id = hp.playerId)
INNER JOIN Hands h ON (h.id = hp.handId)
INNER JOIN Gametypes gt ON (gt.id = h.gametypeId)
WHERE pl.id in <player_test>
AND pl.siteId in <site_test>
AND h.startTime > '<startdate_test>'
AND h.startTime < '<enddate_test>'
<limit_test>
<game_test>
AND hp.tourneysPlayersId IS NULL
GROUP BY h.startTime, hp.handId, hp.sawShowdown, hp.totalProfit
ORDER BY h.startTime"""
New: Tournament Results Viewer Decided to see how hard it would be to get the tournament results using the existing schema. Turns out the cash graph query is pretty similar and not much thought was required. Created a new tab based on the existing cash game viewer for profit. This is probably the idea page for multiple axis to be added. - Distributions for position - distributions by buy-in level - ROI per buy-in level Lots of stuff like that.
2010-09-04 08:16:46 +02:00
####################################
# Tourney Results query
####################################
self.query['tourneyResults'] = """
SQL: Iport tourneyResults query
2010-09-09 12:08:03 +02:00
SELECT tp.tourneyId, (coalesce(tp.winnings,0) - coalesce(tt.buyIn,0) - coalesce(tt.fee,0)) as profit, tp.koCount, tp.rebuyCount, tp.addOnCount, tt.buyIn, tt.fee, t.siteTourneyNo
New: Tournament Results Viewer Decided to see how hard it would be to get the tournament results using the existing schema. Turns out the cash graph query is pretty similar and not much thought was required. Created a new tab based on the existing cash game viewer for profit. This is probably the idea page for multiple axis to be added. - Distributions for position - distributions by buy-in level - ROI per buy-in level Lots of stuff like that.
2010-09-04 08:16:46 +02:00
FROM TourneysPlayers tp
INNER JOIN Players pl ON (pl.id = tp.playerId)
INNER JOIN Tourneys t ON (t.id = tp.tourneyId)
INNER JOIN TourneyTypes tt ON (tt.id = t.tourneyTypeId)
WHERE pl.id in <player_test>
AND pl.siteId in <site_test>
AND t.startTime > '<startdate_test>'
AND t.startTime < '<enddate_test>'
GROUP BY t.startTime, tp.tourneyId, tp.winningsCurrency,
tp.winnings, tp.koCount,
tp.rebuyCount, tp.addOnCount,
tt.buyIn, tt.fee
ORDER BY t.startTime"""
#AND gt.type = 'ring'
#<limit_test>
#<game_test>
Added aggression information in guiplayerstats
2010-06-20 09:58:34 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
####################################
# Session stats query
####################################
if db_server == 'mysql':
self.query['sessionStats'] = """
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
SELECT UNIX_TIMESTAMP(h.startTime) as time, hp.handId, hp.startCash, hp.winnings, hp.totalProfit
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
FROM HandsPlayers hp
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
INNER JOIN Hands h on (h.id = hp.handId)
INNER JOIN Gametypes gt on (gt.Id = h.gameTypeId)
INNER JOIN Sites s on (s.Id = gt.siteId)
INNER JOIN Players p on (p.Id = hp.playerId)
WHERE hp.playerId in <player_test>
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
AND date_format(h.startTime, '%Y-%m-%d') <datestest>
fix session viewer in mysql
2010-08-11 05:53:02 +02:00
AND gt.type LIKE 'ring'
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
ORDER by time"""
elif db_server == 'postgresql':
self.query['sessionStats'] = """
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
SELECT EXTRACT(epoch from h.startTime) as time, hp.handId, hp.startCash, hp.winnings, hp.totalProfit
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
FROM HandsPlayers hp
INNER JOIN Hands h on (h.id = hp.handId)
INNER JOIN Gametypes gt on (gt.Id = h.gameTypeId)
INNER JOIN Sites s on (s.Id = gt.siteId)
INNER JOIN Players p on (p.Id = hp.playerId)
WHERE hp.playerId in <player_test>
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
AND h.startTime <datestest>
fix session stats in pgsql
2010-08-11 06:11:11 +02:00
AND gt.type LIKE 'ring'
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
ORDER by time"""
elif db_server == 'sqlite':
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
self.query['sessionStats'] = """
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
SELECT STRFTIME('<ampersand_s>', h.startTime) as time, hp.handId, hp.startCash, hp.winnings, hp.totalProfit
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
FROM HandsPlayers hp
INNER JOIN Hands h on (h.id = hp.handId)
INNER JOIN Gametypes gt on (gt.Id = h.gameTypeId)
INNER JOIN Sites s on (s.Id = gt.siteId)
INNER JOIN Players p on (p.Id = hp.playerId)
WHERE hp.playerId in <player_test>
DB: renamed Hands.handStart to Hands.startTime for consistency
2010-07-11 08:05:54 +02:00
AND h.startTime <datestest>
Update graph and session queries to identify ring games
2010-07-12 10:41:28 +02:00
AND gt.type is 'ring'
Merge branch 'master' of git://git.assembla.com/fpdboz Conflicts: pyfpdb/Configuration.py pyfpdb/SQL.py note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
ORDER by time"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
####################################
# Queries to rebuild/modify hudcache
####################################
self.query['clearHudCache'] = """DELETE FROM HudCache"""
if db_server == 'mysql':
self.query['rebuildHudCache'] = """
INSERT INTO HudCache
(gametypeId
,playerId
,activeSeats
,position
improve naming of replacement clauses
2010-08-11 04:23:16 +02:00
<tourney_insert_clause>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,styleKey
,HDs
,wonWhenSeenStreet1
add wonWhenSeenStreet2-4 storing to HudCache
2010-08-19 05:59:00 +02:00
,wonWhenSeenStreet2
,wonWhenSeenStreet3
,wonWhenSeenStreet4
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,wonAtSD
,street0VPI
,street0Aggr
,street0_3BChance
,street0_3BDone
add these to HudCache storing: street0_4BChance/Done, other3/4BStreet0
2010-08-19 06:14:12 +02:00
,street0_4BChance
,street0_4BDone
,other3BStreet0
,other4BStreet0
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,street1Seen
,street2Seen
,street3Seen
,street4Seen
,sawShowdown
,street1Aggr
,street2Aggr
,street3Aggr
,street4Aggr
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,otherRaisedStreet0
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,otherRaisedStreet1
,otherRaisedStreet2
,otherRaisedStreet3
,otherRaisedStreet4
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,foldToOtherRaisedStreet0
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,foldToOtherRaisedStreet1
,foldToOtherRaisedStreet2
,foldToOtherRaisedStreet3
,foldToOtherRaisedStreet4
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,raiseFirstInChance
,raisedFirstIn
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,foldBbToStealChance
,foldedBbToSteal
,foldSbToStealChance
,foldedSbToSteal
,street1CBChance
,street1CBDone
,street2CBChance
,street2CBDone
,street3CBChance
,street3CBDone
,street4CBChance
,street4CBDone
,foldToStreet1CBChance
,foldToStreet1CBDone
,foldToStreet2CBChance
,foldToStreet2CBDone
,foldToStreet3CBChance
,foldToStreet3CBDone
,foldToStreet4CBChance
,foldToStreet4CBDone
,totalProfit
,street1CheckCallRaiseChance
,street1CheckCallRaiseDone
,street2CheckCallRaiseChance
,street2CheckCallRaiseDone
,street3CheckCallRaiseChance
,street3CheckCallRaiseDone
,street4CheckCallRaiseChance
,street4CheckCallRaiseDone
Street(x)Bet street(x)Calls were stored in (db.)handplayers. They were not yet available in (db.)hudchache. Using the Bets and Call, together with stree(x)Agression the aggression frequency and aggression factor can be calculated.
2010-06-10 21:00:30 +02:00
,street0Calls
,street1Calls
,street2Calls
,street3Calls
,street4Calls
,street0Bets
,street1Bets
,street2Bets
,street3Bets
,street4Bets
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.
2010-06-11 20:35:34 +02:00
,street0Raises
,street1Raises
,street2Raises
,street3Raises
,street4Raises
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
)
SELECT h.gametypeId
,hp.playerId
,h.seats
,case when hp.position = 'B' then 'B'
when hp.position = 'S' then 'S'
when hp.position = '0' then 'D'
when hp.position = '1' then 'C'
when hp.position = '2' then 'M'
when hp.position = '3' then 'M'
when hp.position = '4' then 'M'
when hp.position = '5' then 'E'
when hp.position = '6' then 'E'
when hp.position = '7' then 'E'
when hp.position = '8' then 'E'
when hp.position = '9' then 'E'
else 'E'
end AS hc_position
improve naming of replacement clauses
2010-08-11 04:23:16 +02:00
<tourney_select_clause>
reverted HudCache styleKey to include only YYMMDD - however, it now stores the d000000 date based off the tz & offset
2010-11-30 20:05:28 +01:00
,date_format(h.startTime, 'd%y%m%d')
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,count(1)
,sum(wonWhenSeenStreet1)
add wonWhenSeenStreet2-4 storing to HudCache
2010-08-19 05:59:00 +02:00
,sum(wonWhenSeenStreet2)
,sum(wonWhenSeenStreet3)
,sum(wonWhenSeenStreet4)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(wonAtSD)
,sum(street0VPI)
,sum(street0Aggr)
,sum(street0_3BChance)
,sum(street0_3BDone)
add these to HudCache storing: street0_4BChance/Done, other3/4BStreet0
2010-08-19 06:14:12 +02:00
,sum(street0_4BChance)
,sum(street0_4BDone)
,sum(other3BStreet0)
,sum(other4BStreet0)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(street1Seen)
,sum(street2Seen)
,sum(street3Seen)
,sum(street4Seen)
,sum(sawShowdown)
,sum(street1Aggr)
,sum(street2Aggr)
,sum(street3Aggr)
,sum(street4Aggr)
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,sum(otherRaisedStreet0)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(otherRaisedStreet1)
,sum(otherRaisedStreet2)
,sum(otherRaisedStreet3)
,sum(otherRaisedStreet4)
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,sum(foldToOtherRaisedStreet0)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(foldToOtherRaisedStreet1)
,sum(foldToOtherRaisedStreet2)
,sum(foldToOtherRaisedStreet3)
,sum(foldToOtherRaisedStreet4)
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,sum(raiseFirstInChance)
,sum(raisedFirstIn)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(foldBbToStealChance)
,sum(foldedBbToSteal)
,sum(foldSbToStealChance)
,sum(foldedSbToSteal)
,sum(street1CBChance)
,sum(street1CBDone)
,sum(street2CBChance)
,sum(street2CBDone)
,sum(street3CBChance)
,sum(street3CBDone)
,sum(street4CBChance)
,sum(street4CBDone)
,sum(foldToStreet1CBChance)
,sum(foldToStreet1CBDone)
,sum(foldToStreet2CBChance)
,sum(foldToStreet2CBDone)
,sum(foldToStreet3CBChance)
,sum(foldToStreet3CBDone)
,sum(foldToStreet4CBChance)
,sum(foldToStreet4CBDone)
,sum(totalProfit)
,sum(street1CheckCallRaiseChance)
,sum(street1CheckCallRaiseDone)
,sum(street2CheckCallRaiseChance)
,sum(street2CheckCallRaiseDone)
,sum(street3CheckCallRaiseChance)
,sum(street3CheckCallRaiseDone)
,sum(street4CheckCallRaiseChance)
,sum(street4CheckCallRaiseDone)
Street(x)Bet street(x)Calls were stored in (db.)handplayers. They were not yet available in (db.)hudchache. Using the Bets and Call, together with stree(x)Agression the aggression frequency and aggression factor can be calculated.
2010-06-10 21:00:30 +02:00
,sum(street0Calls)
,sum(street1Calls)
,sum(street2Calls)
,sum(street3Calls)
,sum(street4Calls)
,sum(street0Bets)
,sum(street1Bets)
,sum(street2Bets)
,sum(street3Bets)
,sum(street4Bets)
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.
2010-06-11 20:35:34 +02:00
,sum(hp.street0Raises)
,sum(hp.street1Raises)
,sum(hp.street2Raises)
,sum(hp.street3Raises)
,sum(hp.street4Raises)
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
FROM HandsPlayers hp
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
INNER JOIN Hands h ON (h.id = hp.handId)
hudcache is regenerated properly on mysql now
2010-08-11 00:10:10 +02:00
<tourney_join_clause>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
<where_clause>
GROUP BY h.gametypeId
,hp.playerId
,h.seats
,hc_position
hudcache is regenerated properly on mysql now
2010-08-11 00:10:10 +02:00
<tourney_group_clause>
reverted HudCache styleKey to include only YYMMDD - however, it now stores the d000000 date based off the tz & offset
2010-11-30 20:05:28 +01:00
,date_format(h.startTime, 'd%y%m%d')
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
elif db_server == 'postgresql':
self.query['rebuildHudCache'] = """
INSERT INTO HudCache
(gametypeId
,playerId
,activeSeats
,position
record HC.TTid on pgsql
2010-08-11 04:39:34 +02:00
<tourney_insert_clause>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,styleKey
,HDs
,wonWhenSeenStreet1
add wonWhenSeenStreet2-4 storing to HudCache
2010-08-19 05:59:00 +02:00
,wonWhenSeenStreet2
,wonWhenSeenStreet3
,wonWhenSeenStreet4
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,wonAtSD
,street0VPI
,street0Aggr
,street0_3BChance
,street0_3BDone
add these to HudCache storing: street0_4BChance/Done, other3/4BStreet0
2010-08-19 06:14:12 +02:00
,street0_4BChance
,street0_4BDone
,other3BStreet0
,other4BStreet0
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,street1Seen
,street2Seen
,street3Seen
,street4Seen
,sawShowdown
,street1Aggr
,street2Aggr
,street3Aggr
,street4Aggr
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,otherRaisedStreet0
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,otherRaisedStreet1
,otherRaisedStreet2
,otherRaisedStreet3
,otherRaisedStreet4
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,foldToOtherRaisedStreet0
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,foldToOtherRaisedStreet1
,foldToOtherRaisedStreet2
,foldToOtherRaisedStreet3
,foldToOtherRaisedStreet4
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,raiseFirstInChance
,raisedFirstIn
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,foldBbToStealChance
,foldedBbToSteal
,foldSbToStealChance
,foldedSbToSteal
,street1CBChance
,street1CBDone
,street2CBChance
,street2CBDone
,street3CBChance
,street3CBDone
,street4CBChance
,street4CBDone
,foldToStreet1CBChance
,foldToStreet1CBDone
,foldToStreet2CBChance
,foldToStreet2CBDone
,foldToStreet3CBChance
,foldToStreet3CBDone
,foldToStreet4CBChance
,foldToStreet4CBDone
,totalProfit
,street1CheckCallRaiseChance
,street1CheckCallRaiseDone
,street2CheckCallRaiseChance
,street2CheckCallRaiseDone
,street3CheckCallRaiseChance
,street3CheckCallRaiseDone
,street4CheckCallRaiseChance
,street4CheckCallRaiseDone
Street(x)Bet street(x)Calls were stored in (db.)handplayers. They were not yet available in (db.)hudchache. Using the Bets and Call, together with stree(x)Agression the aggression frequency and aggression factor can be calculated.
2010-06-10 21:00:30 +02:00
,street0Calls
,street1Calls
,street2Calls
,street3Calls
,street4Calls
,street0Bets
,street1Bets
,street2Bets
,street3Bets
,street4Bets
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.
2010-06-11 20:35:34 +02:00
,street0Raises
,street1Raises
,street2Raises
,street3Raises
,street4Raises
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
)
SELECT h.gametypeId
,hp.playerId
,h.seats
,case when hp.position = 'B' then 'B'
when hp.position = 'S' then 'S'
when hp.position = '0' then 'D'
when hp.position = '1' then 'C'
when hp.position = '2' then 'M'
when hp.position = '3' then 'M'
when hp.position = '4' then 'M'
when hp.position = '5' then 'E'
when hp.position = '6' then 'E'
when hp.position = '7' then 'E'
when hp.position = '8' then 'E'
when hp.position = '9' then 'E'
else 'E'
end AS hc_position
record HC.TTid on pgsql
2010-08-11 04:39:34 +02:00
<tourney_select_clause>
reverted HudCache styleKey to include only YYMMDD - however, it now stores the d000000 date based off the tz & offset
2010-11-30 20:05:28 +01:00
,'d' || to_char(h.startTime, 'YYMMDD')
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,count(1)
,sum(wonWhenSeenStreet1)
add wonWhenSeenStreet2-4 storing to HudCache
2010-08-19 05:59:00 +02:00
,sum(wonWhenSeenStreet2)
,sum(wonWhenSeenStreet3)
,sum(wonWhenSeenStreet4)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(wonAtSD)
,sum(CAST(street0VPI as integer))
,sum(CAST(street0Aggr as integer))
,sum(CAST(street0_3BChance as integer))
,sum(CAST(street0_3BDone as integer))
add these to HudCache storing: street0_4BChance/Done, other3/4BStreet0
2010-08-19 06:14:12 +02:00
,sum(CAST(street0_4BChance as integer))
,sum(CAST(street0_4BDone as integer))
,sum(CAST(other3BStreet0 as integer))
,sum(CAST(other4BStreet0 as integer))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(CAST(street1Seen as integer))
,sum(CAST(street2Seen as integer))
,sum(CAST(street3Seen as integer))
,sum(CAST(street4Seen as integer))
,sum(CAST(sawShowdown as integer))
,sum(CAST(street1Aggr as integer))
,sum(CAST(street2Aggr as integer))
,sum(CAST(street3Aggr as integer))
,sum(CAST(street4Aggr as integer))
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,sum(CAST(otherRaisedStreet0 as integer))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(CAST(otherRaisedStreet1 as integer))
,sum(CAST(otherRaisedStreet2 as integer))
,sum(CAST(otherRaisedStreet3 as integer))
,sum(CAST(otherRaisedStreet4 as integer))
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,sum(CAST(foldToOtherRaisedStreet0 as integer))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(CAST(foldToOtherRaisedStreet1 as integer))
,sum(CAST(foldToOtherRaisedStreet2 as integer))
,sum(CAST(foldToOtherRaisedStreet3 as integer))
,sum(CAST(foldToOtherRaisedStreet4 as integer))
fix typo in pgsql raiseFirstInChance
2010-07-31 22:31:55 +02:00
,sum(CAST(raiseFirstInChance as integer))
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,sum(CAST(raisedFirstIn as integer))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(CAST(foldBbToStealChance as integer))
,sum(CAST(foldedBbToSteal as integer))
,sum(CAST(foldSbToStealChance as integer))
,sum(CAST(foldedSbToSteal as integer))
,sum(CAST(street1CBChance as integer))
,sum(CAST(street1CBDone as integer))
,sum(CAST(street2CBChance as integer))
,sum(CAST(street2CBDone as integer))
,sum(CAST(street3CBChance as integer))
,sum(CAST(street3CBDone as integer))
,sum(CAST(street4CBChance as integer))
,sum(CAST(street4CBDone as integer))
,sum(CAST(foldToStreet1CBChance as integer))
,sum(CAST(foldToStreet1CBDone as integer))
,sum(CAST(foldToStreet2CBChance as integer))
,sum(CAST(foldToStreet2CBDone as integer))
,sum(CAST(foldToStreet3CBChance as integer))
,sum(CAST(foldToStreet3CBDone as integer))
,sum(CAST(foldToStreet4CBChance as integer))
,sum(CAST(foldToStreet4CBDone as integer))
,sum(CAST(totalProfit as integer))
,sum(CAST(street1CheckCallRaiseChance as integer))
,sum(CAST(street1CheckCallRaiseDone as integer))
,sum(CAST(street2CheckCallRaiseChance as integer))
,sum(CAST(street2CheckCallRaiseDone as integer))
,sum(CAST(street3CheckCallRaiseChance as integer))
,sum(CAST(street3CheckCallRaiseDone as integer))
,sum(CAST(street4CheckCallRaiseChance as integer))
,sum(CAST(street4CheckCallRaiseDone as integer))
Street(x)Bet street(x)Calls were stored in (db.)handplayers. They were not yet available in (db.)hudchache. Using the Bets and Call, together with stree(x)Agression the aggression frequency and aggression factor can be calculated.
2010-06-10 21:00:30 +02:00
,sum(CAST(street0Calls as integer))
,sum(CAST(street1Calls as integer))
,sum(CAST(street2Calls as integer))
,sum(CAST(street3Calls as integer))
,sum(CAST(street4Calls as integer))
,sum(CAST(street0Bets as integer))
,sum(CAST(street1Bets as integer))
,sum(CAST(street2Bets as integer))
,sum(CAST(street3Bets as integer))
,sum(CAST(street4Bets as integer))
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.
2010-06-11 20:35:34 +02:00
,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))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
FROM HandsPlayers hp
INNER JOIN Hands h ON (h.id = hp.handId)
record HC.TTid on pgsql
2010-08-11 04:39:34 +02:00
<tourney_join_clause>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
<where_clause>
GROUP BY h.gametypeId
,hp.playerId
,h.seats
,hc_position
record HC.TTid on pgsql
2010-08-11 04:39:34 +02:00
<tourney_group_clause>
reverted HudCache styleKey to include only YYMMDD - however, it now stores the d000000 date based off the tz & offset
2010-11-30 20:05:28 +01:00
,to_char(h.startTime, 'YYMMDD')
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
else: # assume sqlite
self.query['rebuildHudCache'] = """
INSERT INTO HudCache
(gametypeId
,playerId
,activeSeats
,position
improve naming of replacement clauses
2010-08-11 04:23:16 +02:00
<tourney_insert_clause>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,styleKey
,HDs
,wonWhenSeenStreet1
add wonWhenSeenStreet2-4 storing to HudCache
2010-08-19 05:59:00 +02:00
,wonWhenSeenStreet2
,wonWhenSeenStreet3
,wonWhenSeenStreet4
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,wonAtSD
,street0VPI
,street0Aggr
,street0_3BChance
,street0_3BDone
add these to HudCache storing: street0_4BChance/Done, other3/4BStreet0
2010-08-19 06:14:12 +02:00
,street0_4BChance
,street0_4BDone
,other3BStreet0
,other4BStreet0
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,street1Seen
,street2Seen
,street3Seen
,street4Seen
,sawShowdown
,street1Aggr
,street2Aggr
,street3Aggr
,street4Aggr
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,otherRaisedStreet0
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,otherRaisedStreet1
,otherRaisedStreet2
,otherRaisedStreet3
,otherRaisedStreet4
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,foldToOtherRaisedStreet0
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,foldToOtherRaisedStreet1
,foldToOtherRaisedStreet2
,foldToOtherRaisedStreet3
,foldToOtherRaisedStreet4
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,raiseFirstInChance
,raisedFirstIn
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,foldBbToStealChance
,foldedBbToSteal
,foldSbToStealChance
,foldedSbToSteal
,street1CBChance
,street1CBDone
,street2CBChance
,street2CBDone
,street3CBChance
,street3CBDone
,street4CBChance
,street4CBDone
,foldToStreet1CBChance
,foldToStreet1CBDone
,foldToStreet2CBChance
,foldToStreet2CBDone
,foldToStreet3CBChance
,foldToStreet3CBDone
,foldToStreet4CBChance
,foldToStreet4CBDone
,totalProfit
,street1CheckCallRaiseChance
,street1CheckCallRaiseDone
,street2CheckCallRaiseChance
,street2CheckCallRaiseDone
,street3CheckCallRaiseChance
,street3CheckCallRaiseDone
,street4CheckCallRaiseChance
,street4CheckCallRaiseDone
Street(x)Bet street(x)Calls were stored in (db.)handplayers. They were not yet available in (db.)hudchache. Using the Bets and Call, together with stree(x)Agression the aggression frequency and aggression factor can be calculated.
2010-06-10 21:00:30 +02:00
,street0Calls
,street1Calls
,street2Calls
,street3Calls
,street4Calls
,street0Bets
,street1Bets
,street2Bets
,street3Bets
,street4Bets
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.
2010-06-11 20:35:34 +02:00
,street0Raises
,street1Raises
,street2Raises
,street3Raises
,street4Raises
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
)
SELECT h.gametypeId
,hp.playerId
,h.seats
,case when hp.position = 'B' then 'B'
when hp.position = 'S' then 'S'
when hp.position = '0' then 'D'
when hp.position = '1' then 'C'
when hp.position = '2' then 'M'
when hp.position = '3' then 'M'
when hp.position = '4' then 'M'
when hp.position = '5' then 'E'
when hp.position = '6' then 'E'
when hp.position = '7' then 'E'
when hp.position = '8' then 'E'
when hp.position = '9' then 'E'
else 'E'
end AS hc_position
improve naming of replacement clauses
2010-08-11 04:23:16 +02:00
<tourney_select_clause>
reverted HudCache styleKey to include only YYMMDD - however, it now stores the d000000 date based off the tz & offset
2010-11-30 20:05:28 +01:00
,'d' || substr(strftime('%Y%m%d', h.startTime),3,7)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,count(1)
,sum(wonWhenSeenStreet1)
add wonWhenSeenStreet2-4 storing to HudCache
2010-08-19 05:59:00 +02:00
,sum(wonWhenSeenStreet2)
,sum(wonWhenSeenStreet3)
,sum(wonWhenSeenStreet4)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(wonAtSD)
,sum(CAST(street0VPI as integer))
,sum(CAST(street0Aggr as integer))
,sum(CAST(street0_3BChance as integer))
,sum(CAST(street0_3BDone as integer))
add these to HudCache storing: street0_4BChance/Done, other3/4BStreet0
2010-08-19 06:14:12 +02:00
,sum(CAST(street0_4BChance as integer))
,sum(CAST(street0_4BDone as integer))
,sum(CAST(other3BStreet0 as integer))
,sum(CAST(other4BStreet0 as integer))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(CAST(street1Seen as integer))
,sum(CAST(street2Seen as integer))
,sum(CAST(street3Seen as integer))
,sum(CAST(street4Seen as integer))
,sum(CAST(sawShowdown as integer))
,sum(CAST(street1Aggr as integer))
,sum(CAST(street2Aggr as integer))
,sum(CAST(street3Aggr as integer))
,sum(CAST(street4Aggr as integer))
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,sum(CAST(otherRaisedStreet0 as integer))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(CAST(otherRaisedStreet1 as integer))
,sum(CAST(otherRaisedStreet2 as integer))
,sum(CAST(otherRaisedStreet3 as integer))
,sum(CAST(otherRaisedStreet4 as integer))
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
,sum(CAST(foldToOtherRaisedStreet0 as integer))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(CAST(foldToOtherRaisedStreet1 as integer))
,sum(CAST(foldToOtherRaisedStreet2 as integer))
,sum(CAST(foldToOtherRaisedStreet3 as integer))
,sum(CAST(foldToOtherRaisedStreet4 as integer))
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
,sum(CAST(raiseFirstInChance as integer))
,sum(CAST(raisedFirstIn as integer))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,sum(CAST(foldBbToStealChance as integer))
,sum(CAST(foldedBbToSteal as integer))
,sum(CAST(foldSbToStealChance as integer))
,sum(CAST(foldedSbToSteal as integer))
,sum(CAST(street1CBChance as integer))
,sum(CAST(street1CBDone as integer))
,sum(CAST(street2CBChance as integer))
,sum(CAST(street2CBDone as integer))
,sum(CAST(street3CBChance as integer))
,sum(CAST(street3CBDone as integer))
,sum(CAST(street4CBChance as integer))
,sum(CAST(street4CBDone as integer))
,sum(CAST(foldToStreet1CBChance as integer))
,sum(CAST(foldToStreet1CBDone as integer))
,sum(CAST(foldToStreet2CBChance as integer))
,sum(CAST(foldToStreet2CBDone as integer))
,sum(CAST(foldToStreet3CBChance as integer))
,sum(CAST(foldToStreet3CBDone as integer))
,sum(CAST(foldToStreet4CBChance as integer))
,sum(CAST(foldToStreet4CBDone as integer))
,sum(CAST(totalProfit as integer))
,sum(CAST(street1CheckCallRaiseChance as integer))
,sum(CAST(street1CheckCallRaiseDone as integer))
,sum(CAST(street2CheckCallRaiseChance as integer))
,sum(CAST(street2CheckCallRaiseDone as integer))
,sum(CAST(street3CheckCallRaiseChance as integer))
,sum(CAST(street3CheckCallRaiseDone as integer))
,sum(CAST(street4CheckCallRaiseChance as integer))
,sum(CAST(street4CheckCallRaiseDone as integer))
Street(x)Bet street(x)Calls were stored in (db.)handplayers. They were not yet available in (db.)hudchache. Using the Bets and Call, together with stree(x)Agression the aggression frequency and aggression factor can be calculated.
2010-06-10 21:00:30 +02:00
,sum(CAST(street0Calls as integer))
,sum(CAST(street1Calls as integer))
,sum(CAST(street2Calls as integer))
,sum(CAST(street3Calls as integer))
,sum(CAST(street4Calls as integer))
,sum(CAST(street0Bets as integer))
,sum(CAST(street1Bets as integer))
,sum(CAST(street2Bets as integer))
,sum(CAST(street3Bets as integer))
,sum(CAST(street4Bets as integer))
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.
2010-06-11 20:35:34 +02:00
,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))
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
FROM HandsPlayers hp
INNER JOIN Hands h ON (h.id = hp.handId)
hudcache is regenerated properly on mysql now
2010-08-11 00:10:10 +02:00
<tourney_join_clause>
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
<where_clause>
GROUP BY h.gametypeId
,hp.playerId
,h.seats
,hc_position
hudcache is regenerated properly on mysql now
2010-08-11 00:10:10 +02:00
<tourney_group_clause>
reverted HudCache styleKey to include only YYMMDD - however, it now stores the d000000 date based off the tz & offset
2010-11-30 20:05:28 +01:00
,'d' || substr(strftime('%Y%m%d', h.startTime),3,7)
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
"""
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
self.query['insert_hudcache'] = """
INSERT INTO HudCache (
gametypeId,
playerId,
activeSeats,
position,
tourneyTypeId,
styleKey,
HDs,
street0VPI,
street0Aggr,
street0_3BChance,
street0_3BDone,
add these to HudCache storing: street0_4BChance/Done, other3/4BStreet0
2010-08-19 06:14:12 +02:00
street0_4BChance,
street0_4BDone,
other3BStreet0,
other4BStreet0,
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
street1Seen,
street2Seen,
street3Seen,
street4Seen,
sawShowdown,
street1Aggr,
street2Aggr,
street3Aggr,
street4Aggr,
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
otherRaisedStreet0,
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
otherRaisedStreet1,
otherRaisedStreet2,
otherRaisedStreet3,
otherRaisedStreet4,
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
foldToOtherRaisedStreet0,
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
foldToOtherRaisedStreet1,
foldToOtherRaisedStreet2,
foldToOtherRaisedStreet3,
foldToOtherRaisedStreet4,
wonWhenSeenStreet1,
add wonWhenSeenStreet2-4 storing to HudCache
2010-08-19 05:59:00 +02:00
wonWhenSeenStreet2,
wonWhenSeenStreet3,
wonWhenSeenStreet4,
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
wonAtSD,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
raiseFirstInChance,
raisedFirstIn,
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
foldBbToStealChance,
foldedBbToSteal,
foldSbToStealChance,
foldedSbToSteal,
street1CBChance,
street1CBDone,
street2CBChance,
street2CBDone,
street3CBChance,
street3CBDone,
street4CBChance,
street4CBDone,
foldToStreet1CBChance,
foldToStreet1CBDone,
foldToStreet2CBChance,
foldToStreet2CBDone,
foldToStreet3CBChance,
foldToStreet3CBDone,
foldToStreet4CBChance,
foldToStreet4CBDone,
totalProfit,
street1CheckCallRaiseChance,
street1CheckCallRaiseDone,
street2CheckCallRaiseChance,
street2CheckCallRaiseDone,
street3CheckCallRaiseChance,
street3CheckCallRaiseDone,
street4CheckCallRaiseChance,
Street(x)Bet street(x)Calls were stored in (db.)handplayers. They were not yet available in (db.)hudchache. Using the Bets and Call, together with stree(x)Agression the aggression frequency and aggression factor can be calculated.
2010-06-10 21:00:30 +02:00
street4CheckCallRaiseDone,
street0Calls,
street1Calls,
street2Calls,
street3Calls,
street4Calls,
street0Bets,
street1Bets,
street2Bets,
street3Bets,
Street(x)Bet and street(x)Call and Street(x)Raises Now updates in hud chache also
2010-06-11 20:33:08 +02:00
street4Bets,
street0Raises,
street1Raises,
street2Raises,
street3Raises,
street4Raises)
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
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,
Street(x)Bet street(x)Calls were stored in (db.)handplayers. They were not yet available in (db.)hudchache. Using the Bets and Call, together with stree(x)Agression the aggression frequency and aggression factor can be calculated.
2010-06-10 21:00:30 +02:00
%s, %s, %s, %s, %s,
%s, %s, %s, %s, %s,
Street(x)Bet and street(x)Call and Street(x)Raises Now updates in hud chache also
2010-06-11 20:33:08 +02:00
%s, %s, %s, %s, %s,
add these to HudCache storing: street0_4BChance/Done, other3/4BStreet0
2010-08-19 06:14:12 +02:00
%s, %s, %s, %s, %s,
%s, %s, %s, %s, %s)"""
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
self.query['update_hudcache'] = """
UPDATE HudCache SET
HDs=HDs+%s,
street0VPI=street0VPI+%s,
street0Aggr=street0Aggr+%s,
street0_3BChance=street0_3BChance+%s,
street0_3BDone=street0_3BDone+%s,
fix update hud cache/auto import
2010-08-21 18:30:10 +02:00
street0_4BChance=street0_4BChance+%s,
street0_4BDone=street0_4BDone+%s,
other3BStreet0=other3BStreet0+%s,
other4BStreet0=other4BStreet0+%s,
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
street1Seen=street1Seen+%s,
street2Seen=street2Seen+%s,
street3Seen=street3Seen+%s,
street4Seen=street4Seen+%s,
sawShowdown=sawShowdown+%s,
street1Aggr=street1Aggr+%s,
street2Aggr=street2Aggr+%s,
street3Aggr=street3Aggr+%s,
street4Aggr=street4Aggr+%s,
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
otherRaisedStreet0=otherRaisedStreet0+%s,
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
otherRaisedStreet1=otherRaisedStreet1+%s,
otherRaisedStreet2=otherRaisedStreet2+%s,
otherRaisedStreet3=otherRaisedStreet3+%s,
otherRaisedStreet4=otherRaisedStreet4+%s,
add (foldTo)otherRaisedStreet0 storing to HudCache
2010-08-19 06:05:59 +02:00
foldToOtherRaisedStreet0=foldToOtherRaisedStreet0+%s,
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
foldToOtherRaisedStreet1=foldToOtherRaisedStreet1+%s,
foldToOtherRaisedStreet2=foldToOtherRaisedStreet2+%s,
foldToOtherRaisedStreet3=foldToOtherRaisedStreet3+%s,
foldToOtherRaisedStreet4=foldToOtherRaisedStreet4+%s,
wonWhenSeenStreet1=wonWhenSeenStreet1+%s,
add wonWhenSeenStreet2-4 storing to HudCache
2010-08-19 05:59:00 +02:00
wonWhenSeenStreet2=wonWhenSeenStreet2+%s,
wonWhenSeenStreet3=wonWhenSeenStreet3+%s,
wonWhenSeenStreet4=wonWhenSeenStreet4+%s,
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
wonAtSD=wonAtSD+%s,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
raiseFirstInChance=raiseFirstInChance+%s,
raisedFirstIn=raisedFirstIn+%s,
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
foldBbToStealChance=foldBbToStealChance+%s,
foldedBbToSteal=foldedBbToSteal+%s,
foldSbToStealChance=foldSbToStealChance+%s,
foldedSbToSteal=foldedSbToSteal+%s,
street1CBChance=street1CBChance+%s,
street1CBDone=street1CBDone+%s,
street2CBChance=street2CBChance+%s,
street2CBDone=street2CBDone+%s,
street3CBChance=street3CBChance+%s,
street3CBDone=street3CBDone+%s,
street4CBChance=street4CBChance+%s,
street4CBDone=street4CBDone+%s,
foldToStreet1CBChance=foldToStreet1CBChance+%s,
foldToStreet1CBDone=foldToStreet1CBDone+%s,
foldToStreet2CBChance=foldToStreet2CBChance+%s,
foldToStreet2CBDone=foldToStreet2CBDone+%s,
foldToStreet3CBChance=foldToStreet3CBChance+%s,
foldToStreet3CBDone=foldToStreet3CBDone+%s,
foldToStreet4CBChance=foldToStreet4CBChance+%s,
foldToStreet4CBDone=foldToStreet4CBDone+%s,
totalProfit=totalProfit+%s,
street1CheckCallRaiseChance=street1CheckCallRaiseChance+%s,
street1CheckCallRaiseDone=street1CheckCallRaiseDone+%s,
street2CheckCallRaiseChance=street2CheckCallRaiseChance+%s,
street2CheckCallRaiseDone=street2CheckCallRaiseDone+%s,
street3CheckCallRaiseChance=street3CheckCallRaiseChance+%s,
street3CheckCallRaiseDone=street3CheckCallRaiseDone+%s,
street4CheckCallRaiseChance=street4CheckCallRaiseChance+%s,
Street(x)Bet street(x)Calls were stored in (db.)handplayers. They were not yet available in (db.)hudchache. Using the Bets and Call, together with stree(x)Agression the aggression frequency and aggression factor can be calculated.
2010-06-10 21:00:30 +02:00
street4CheckCallRaiseDone=street4CheckCallRaiseDone+%s,
street0Calls=street0Calls+%s,
street1Calls=street1Calls+%s,
street2Calls=street2Calls+%s,
street3Calls=street3Calls+%s,
street4Calls=street4Calls+%s,
street0Bets=street0Bets+%s,
street1Bets=street1Bets+%s,
street2Bets=street2Bets+%s,
street3Bets=street3Bets+%s,
Street(x)Bet and street(x)Call and Street(x)Raises Now updates in hud chache also
2010-06-11 20:33:08 +02:00
street4Bets=street4Bets+%s,
street0Raises=street0Raises+%s,
street1Raises=street1Raises+%s,
street2Raises=street2Raises+%s,
street3Raises=street3Raises+%s,
street4Raises=street4Raises+%s
turns out the the '+0' is for indexing and has nothing to do with NULLS so I put it back in
2010-12-02 06:27:03 +01:00
WHERE gametypeId+0=%s
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
AND playerId=%s
AND activeSeats=%s
AND position=%s
* update_hudcache wasn't updating existing cashgame records because it was trying to match a NULL tourneyTypeId with a %s None value. Changed the logic of the SQL to handle this situation. It appeared like someone had tried to handle this by adding '+0' to the NULL record but it doesn't work. * Deleted the attempted '+0' NULL value handling for gametypeId. gametypeId should never be null as an error would have already been thrown before it was inserted
2010-12-01 22:35:38 +01:00
AND (case when tourneyTypeId is NULL then 1 else
turns out the the '+0' is for indexing and has nothing to do with NULLS so I put it back in
2010-12-02 06:27:03 +01:00
(case when tourneyTypeId+0=%s then 1 else 0 end) end)=1
[NEWIMPORT] Add function to update hudcache for Hand
2009-12-23 16:14:34 +01:00
AND styleKey=%s"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['get_hero_hudcache_start'] = """select min(hc.styleKey)
from HudCache hc
where hc.playerId in <playerid_list>
and hc.styleKey like 'd%'"""
Tourney import : tRecognizeTourney implemented (search, update or insert a Tourney
2009-09-02 22:55:47 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
if db_server == 'mysql':
self.query['analyze'] = """
analyze table Autorates, GameTypes, Hands, HandsPlayers, HudCache, Players
, Settings, Sites, Tourneys, TourneysPlayers, TourneyTypes
Tourney import : tRecognizeTourney implemented (search, update or insert a Tourney
2009-09-02 22:55:47 +02:00
"""
add rebuild indexes option to Database menu (can we put tooltips over these menu options?)
2009-11-30 00:02:45 +01:00
elif db_server == 'postgresql':
self.query['analyze'] = "analyze"
elif db_server == 'sqlite':
self.query['analyze'] = "analyze"
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
if db_server == 'mysql':
self.query['lockForInsert'] = """
lock tables Hands write, HandsPlayers write, HandsActions write, Players write
, HudCache write, GameTypes write, Sites write, Tourneys write
, TourneysPlayers write, TourneyTypes write, Autorates write
"""
add rebuild indexes option to Database menu (can we put tooltips over these menu options?)
2009-11-30 00:02:45 +01:00
elif db_server == 'postgresql':
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['lockForInsert'] = ""
add rebuild indexes option to Database menu (can we put tooltips over these menu options?)
2009-11-30 00:02:45 +01:00
elif db_server == 'sqlite':
self.query['lockForInsert'] = ""
if db_server == 'mysql':
self.query['vacuum'] = """optimize table Hands, HandsPlayers, HandsActions, Players
, HudCache, GameTypes, Sites, Tourneys
, TourneysPlayers, TourneyTypes, Autorates
"""
elif db_server == 'postgresql':
self.query['vacuum'] = """ vacuum """
elif db_server == 'sqlite':
self.query['vacuum'] = """ vacuum """
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['getGametypeFL'] = """SELECT id
FROM Gametypes
WHERE siteId=%s
AND type=%s
AND category=%s
AND limitType=%s
AND smallBet=%s
AND bigBet=%s
"""
self.query['getGametypeNL'] = """SELECT id
FROM Gametypes
WHERE siteId=%s
AND type=%s
AND category=%s
AND limitType=%s
sql.py change for storing currency
2010-07-29 23:27:36 +02:00
AND currency=%s
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
AND smallBlind=%s
AND bigBlind=%s
"""
self.query['insertGameTypes'] = """INSERT INTO Gametypes
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
(siteId, currency, type, base, category, limitType
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
,hiLo, smallBlind, bigBlind, smallBet, bigBet)
changed TourneyTypes as discussed, some currency-related fixes I haven't expanded all queries etc. to include the new fields as that code is not currently used by anything and can be expanded as needed
2010-06-25 11:02:01 +02:00
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['isAlreadyInDB'] = """SELECT id FROM Hands
WHERE gametypeId=%s AND siteHandNo=%s
"""
self.query['getTourneyTypeIdByTourneyNo'] = """SELECT tt.id,
tt.buyin,
tt.fee,
tt.maxSeats,
tt.knockout,
split TourneyTypes.rebuyOrAddon to rebuy and addOn
2010-06-22 22:27:10 +02:00
tt.rebuy,
tt.addOn,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
tt.speed,
tt.shootout,
tt.matrix
FROM TourneyTypes tt
INNER JOIN Tourneys t ON (t.tourneyTypeId = tt.id)
WHERE t.siteTourneyNo=%s AND tt.siteId=%s
"""
self.query['getTourneyTypeId'] = """SELECT id
FROM TourneyTypes
WHERE siteId=%s
store Tourneys and TourneyTypes for PS tourneys. see ML for more details
2010-07-05 11:48:26 +02:00
AND currency=%s
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
AND buyin=%s
AND fee=%s
some fixes for handStart rename, fixes for TT.category/limitType, dumpDatabase method and menu entry
2010-07-11 09:47:05 +02:00
AND category=%s
AND limitType=%s
actually store TT.maxSeats
2010-08-22 06:46:47 +02:00
AND maxSeats=%s
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
AND knockout=%s
split TourneyTypes.rebuyOrAddon to rebuy and addOn
2010-06-22 22:27:10 +02:00
AND rebuy=%s
AND addOn=%s
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
AND speed=%s
AND shootout=%s
AND matrix=%s
"""
store Tourneys and TourneyTypes for PS tourneys. see ML for more details
2010-07-05 11:48:26 +02:00
self.query['insertTourneyType'] = """INSERT INTO TourneyTypes
actually store TT.maxSeats
2010-08-22 06:46:47 +02:00
(siteId, currency, buyin, fee, category, limitType, maxSeats, buyInChips, knockout, koBounty, rebuy,
TOURNEY: record added/addedCurrency
2010-07-17 02:35:02 +02:00
addOn ,speed, shootout, matrix, added, addedCurrency)
actually store TT.maxSeats
2010-08-22 06:46:47 +02:00
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
"""
TOURNEY: DB.createOrUpdateTourney fills in missing fields now
2010-07-14 22:36:07 +02:00
self.query['getTourneyByTourneyNo'] = """SELECT t.*
store Tourneys and TourneyTypes for PS tourneys. see ML for more details
2010-07-05 11:48:26 +02:00
FROM Tourneys t
INNER JOIN TourneyTypes tt ON (t.tourneyTypeId = tt.id)
WHERE tt.siteId=%s AND t.siteTourneyNo=%s
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
"""
add tourney viewer that displays info from TT and T, but not yet TP
2010-08-09 23:22:58 +02:00
self.query['getTourneyInfo'] = """SELECT tt.*, t.*
FROM Tourneys t
INNER JOIN TourneyTypes tt ON (t.tourneyTypeId = tt.id)
INNER JOIN Sites s ON (tt.siteId = s.id)
WHERE s.name=%s AND t.siteTourneyNo=%s
"""
add button to display info from TP to tourneyviewer
2010-08-09 23:41:48 +02:00
self.query['getTourneyPlayerInfo'] = """SELECT tp.*
FROM Tourneys t
INNER JOIN TourneyTypes tt ON (t.tourneyTypeId = tt.id)
INNER JOIN Sites s ON (tt.siteId = s.id)
INNER JOIN TourneysPlayers tp ON (tp.tourneyId = t.id)
INNER JOIN Players p ON (p.id = tp.playerId)
WHERE s.name=%s AND t.siteTourneyNo=%s AND p.name=%s
"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['insertTourney'] = """INSERT INTO Tourneys
(tourneyTypeId, siteTourneyNo, entries, prizepool,
removed fields from Tourneys buyinChips, rebuyChips, addonChips, rebuyAmount, addonAmount and koBounty
2010-06-21 15:48:22 +02:00
startTime, endTime, tourneyName, matrixIdProcessed,
store Tourneys and TourneyTypes for PS tourneys. see ML for more details
2010-07-05 11:48:26 +02:00
totalRebuyCount, totalAddOnCount)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
"""
self.query['updateTourney'] = """UPDATE Tourneys
TOURNEY: DB.createOrUpdateTourney fills in missing fields now
2010-07-14 22:36:07 +02:00
SET entries = %s,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
prizepool = %s,
startTime = %s,
endTime = %s,
tourneyName = %s,
matrixIdProcessed = %s,
renamed totalRebuys/AddOns to totalRebuyCount/AddOnCount
2010-06-21 16:45:15 +02:00
totalRebuyCount = %s,
split TourneyTypes.rebuyOrAddon to rebuy and addOn
2010-06-22 22:27:10 +02:00
totalAddOnCount = %s,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
comment = %s,
commentTs = %s
WHERE id=%s
"""
TOURNEY: createOrUpdateTourneysPlayers now updates fields as needed
2010-07-14 23:05:37 +02:00
self.query['getTourneysPlayersByIds'] = """SELECT *
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
FROM TourneysPlayers
WHERE tourneyId=%s AND playerId+0=%s
"""
TOURNEY: createOrUpdateTourneysPlayers now updates fields as needed
2010-07-14 23:05:37 +02:00
self.query['updateTourneysPlayer'] = """UPDATE TourneysPlayers
removed TourneysPlayers.payinAmounts
2010-07-02 22:40:40 +02:00
SET rank = %s,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
winnings = %s,
removed 2 ancient unusued methods and updated TourneysPlayers tested bulk import for PS and FTP, player stats and positional stats also fixed a little bug that sqlite created HandsPlayers.actionString with type REAL instead of VARCHAR
2010-06-22 21:05:33 +02:00
winningsCurrency = %s,
rebuyCount = %s,
addOnCount = %s,
TOURNEY: createOrUpdateTourneysPlayers now updates fields as needed
2010-07-14 23:05:37 +02:00
koCount = %s
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
WHERE id=%s
"""
Last part of core tourney import Database.py : tStoreTourneyPlayers and tUpdateTourneysHandsPlayers implemented HandHistoryConverter.py : fix for 0-byte summary files SQL.py : new queries Tourney.py : cleanup stdout
2009-09-04 02:01:41 +02:00
minor DB changes. recording TourneysPlayers now for FTP and PS
2010-07-07 00:52:44 +02:00
self.query['insertTourneysPlayer'] = """INSERT INTO TourneysPlayers
PS Summary now stores rank, winnings, etc. into TourneysPl.
2010-07-09 01:07:22 +02:00
(tourneyId, playerId, rank, winnings, winningsCurrency, rebuyCount, addOnCount, koCount)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
"""
Last part of core tourney import Database.py : tStoreTourneyPlayers and tUpdateTourneysHandsPlayers implemented HandHistoryConverter.py : fix for 0-byte summary files SQL.py : new queries Tourney.py : cleanup stdout
2009-09-04 02:01:41 +02:00
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['selectHandsPlayersWithWrongTTypeId'] = """SELECT id
FROM HandsPlayers
WHERE tourneyTypeId <> %s AND (TourneysPlayersId+0=%s)
"""
Last part of core tourney import Database.py : tStoreTourneyPlayers and tUpdateTourneysHandsPlayers implemented HandHistoryConverter.py : fix for 0-byte summary files SQL.py : new queries Tourney.py : cleanup stdout
2009-09-04 02:01:41 +02:00
# self.query['updateHandsPlayersForTTypeId2'] = """UPDATE HandsPlayers
# SET tourneyTypeId= %s
# WHERE (TourneysPlayersId+0=%s)
# """
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
self.query['updateHandsPlayersForTTypeId'] = """UPDATE HandsPlayers
SET tourneyTypeId= %s
WHERE (id=%s)
"""
self.query['handsPlayersTTypeId_joiner'] = " OR TourneysPlayersId+0="
self.query['handsPlayersTTypeId_joiner_id'] = " OR id="
self.query['store_hand'] = """INSERT INTO Hands (
tablename,
gametypeid,
sitehandno,
add tourneyid to hands table (REQUIRES REIMPORT) and fix sqlite db access
2010-01-26 23:46:48 +01:00
tourneyId,
some fixes for handStart rename, fixes for TT.category/limitType, dumpDatabase method and menu entry
2010-07-11 09:47:05 +02:00
startTime,
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
importtime,
seats,
maxseats,
texture,
playersVpi,
boardcard1,
boardcard2,
boardcard3,
boardcard4,
boardcard5,
playersAtStreet1,
playersAtStreet2,
playersAtStreet3,
playersAtStreet4,
playersAtShowdown,
street0Raises,
street1Raises,
street2Raises,
street3Raises,
street4Raises,
street1Pot,
street2Pot,
street3Pot,
street4Pot,
showdownPot
)
VALUES
(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
add tourneyid to hands table (REQUIRES REIMPORT) and fix sqlite db access
2010-01-26 23:46:48 +01:00
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
[NEWIMPORT] Move HandsPlayers insert statement into SQL.py
2009-12-14 11:01:24 +01:00
self.query['store_hands_players'] = """INSERT INTO HandsPlayers (
handId,
playerId,
startCash,
seatNo,
added HandsPlayers.sitout as discussed on ML
2010-07-02 22:17:15 +02:00
sitout,
[NEWIMPORT] Move HandsPlayers insert statement into SQL.py
2009-12-14 11:01:24 +01:00
card1,
card2,
card3,
card4,
card5,
card6,
card7,
winnings,
rake,
totalProfit,
street0VPI,
street1Seen,
street2Seen,
street3Seen,
street4Seen,
sawShowdown,
wonAtSD,
street0Aggr,
street1Aggr,
street2Aggr,
street3Aggr,
street4Aggr,
street1CBChance,
street2CBChance,
street3CBChance,
street4CBChance,
street1CBDone,
street2CBDone,
street3CBDone,
street4CBDone,
wonWhenSeenStreet1,
add wonWhenSeenStreet2-4 to DerivedStats' unimplemented section, store 0.0 by default
2010-08-19 03:55:12 +02:00
wonWhenSeenStreet2,
wonWhenSeenStreet3,
wonWhenSeenStreet4,
[NEWIMPORT] Move HandsPlayers insert statement into SQL.py
2009-12-14 11:01:24 +01:00
street0Calls,
street1Calls,
street2Calls,
street3Calls,
street4Calls,
street0Bets,
street1Bets,
street2Bets,
street3Bets,
street4Bets,
position,
TOURNEY: store HandsPlayers.tourneysPlayersId
2010-07-15 00:27:57 +02:00
tourneysPlayersId,
[NEWIMPORT] Move HandsPlayers insert statement into SQL.py
2009-12-14 11:01:24 +01:00
startCards,
street0_3BChance,
street0_3BDone,
add these stats to DB/DerivedStats/SQL: street0_4BChance/Done, other3/4BStreet0
2010-08-19 04:09:24 +02:00
street0_4BChance,
street0_4BDone,
other3BStreet0,
other4BStreet0,
add otherRaisedStreet0 and foldToOtherRaisedStreet0 with defualt false
2010-08-19 04:01:44 +02:00
otherRaisedStreet0,
[NEWIMPORT] Move HandsPlayers insert statement into SQL.py
2009-12-14 11:01:24 +01:00
otherRaisedStreet1,
otherRaisedStreet2,
otherRaisedStreet3,
otherRaisedStreet4,
add otherRaisedStreet0 and foldToOtherRaisedStreet0 with defualt false
2010-08-19 04:01:44 +02:00
foldToOtherRaisedStreet0,
[NEWIMPORT] Move HandsPlayers insert statement into SQL.py
2009-12-14 11:01:24 +01:00
foldToOtherRaisedStreet1,
foldToOtherRaisedStreet2,
foldToOtherRaisedStreet3,
foldToOtherRaisedStreet4,
rename stealattempt fields to raisefirstin and derive accordingly
2010-07-27 23:27:18 +02:00
raiseFirstInChance,
raisedFirstIn,
[NEWIMPORT] Move HandsPlayers insert statement into SQL.py
2009-12-14 11:01:24 +01:00
foldBbToStealChance,
foldedBbToSteal,
foldSbToStealChance,
foldedSbToSteal,
foldToStreet1CBChance,
foldToStreet1CBDone,
foldToStreet2CBChance,
foldToStreet2CBDone,
foldToStreet3CBChance,
foldToStreet3CBDone,
foldToStreet4CBChance,
foldToStreet4CBDone,
street1CheckCallRaiseChance,
street1CheckCallRaiseDone,
street2CheckCallRaiseChance,
street2CheckCallRaiseDone,
street3CheckCallRaiseChance,
street3CheckCallRaiseDone,
[NEWIMPORT] Add stubbed variable to insert
2009-12-18 03:27:43 +01:00
street4CheckCallRaiseChance,
Street(x)Bet and street(x)Call and Street(x)Raises Now updates in hud chache also
2010-06-11 20:33:08 +02:00
street4CheckCallRaiseDone,
street0Raises,
street1Raises,
street2Raises,
street3Raises,
street4Raises
[NEWIMPORT] Move HandsPlayers insert statement into SQL.py
2009-12-14 11:01:24 +01:00
)
VALUES (
[NEWIMPORT] Add stubbed variable to insert
2009-12-18 03:27:43 +01:00
%s, %s, %s, %s, %s,
[NEWIMPORT] Move HandsPlayers insert statement into SQL.py
2009-12-14 11:01:24 +01:00
%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,
Street(x)Bet and street(x)Call and Street(x)Raises Now updates in hud chache also
2010-06-11 20:33:08 +02:00
%s, %s, %s, %s, %s,
[NEWIMPORT] Move HandsPlayers insert statement into SQL.py
2009-12-14 11:01:24 +01:00
%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,
added HandsPlayers.sitout as discussed on ML
2010-07-02 22:17:15 +02:00
%s, %s, %s, %s, %s,
add otherRaisedStreet0 and foldToOtherRaisedStreet0 with defualt false
2010-08-19 04:01:44 +02:00
%s, %s, %s, %s, %s,
add these stats to DB/DerivedStats/SQL: street0_4BChance/Done, other3/4BStreet0
2010-08-19 04:09:24 +02:00
%s, %s, %s, %s, %s
[NEWIMPORT] Move HandsPlayers insert statement into SQL.py
2009-12-14 11:01:24 +01:00
)"""
More HandsActions stubbing
2010-09-01 18:19:31 +02:00
self.query['store_hands_actions'] = """INSERT INTO HandsActions (
handsPlayerId,
street,
actionNo,
* updated 'createHandsActionsTable' and 'store_hands_actions' in the SQL dictionary
2010-09-28 23:01:31 +02:00
streetActionNo,
actionId,
amount,
raiseTo,
amountCalled,
numDiscarded,
cardsDiscarded,
allIn
More HandsActions stubbing
2010-09-01 18:19:31 +02:00
)
VALUES (
* updated 'createHandsActionsTable' and 'store_hands_actions' in the SQL dictionary
2010-09-28 23:01:31 +02:00
%s, %s, %s, %s, %s,
More HandsActions stubbing
2010-09-01 18:19:31 +02:00
%s, %s, %s, %s, %s,
%s
)"""
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
intermediate commit on the way to tourney stats
2010-07-10 05:19:50 +02:00
################################
# Counts for DB stats window
################################
basic optimisation in stats
2010-10-06 16:57:33 +02:00
self.query['getHandCount'] = "SELECT COUNT(*) FROM Hands"
self.query['getTourneyCount'] = "SELECT COUNT(*) FROM Tourneys"
self.query['getTourneyTypeCount'] = "SELECT COUNT(*) FROM TourneyTypes"
implement simple DB stats - Hand and tourney count
2010-07-10 02:07:47 +02:00
some fixes for handStart rename, fixes for TT.category/limitType, dumpDatabase method and menu entry
2010-07-11 09:47:05 +02:00
################################
# queries for dumpDatabase
################################
add new tables RawHands/RawTourneys
2010-08-21 04:29:29 +02:00
for table in (u'Autorates', u'Backings', u'Gametypes', u'Hands', u'HandsActions', u'HandsPlayers', u'HudCache', u'Players', u'RawHands', u'RawTourneys', u'Settings', u'Sites', u'TourneyTypes', u'Tourneys', u'TourneysPlayers'):
some fixes for handStart rename, fixes for TT.category/limitType, dumpDatabase method and menu entry
2010-07-11 09:47:05 +02:00
self.query['get'+table] = u"SELECT * FROM "+table
intermediate commit on the way to tourney stats
2010-07-10 05:19:50 +02:00
################################
# placeholders and substitution stuff
################################
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
if db_server == 'mysql':
self.query['placeholder'] = u'%s'
elif db_server == 'postgresql':
self.query['placeholder'] = u'%s'
elif db_server == 'sqlite':
self.query['placeholder'] = u'?'
# If using sqlite, use the ? placeholder instead of %s
if db_server == 'sqlite':
for k,q in self.query.iteritems():
self.query[k] = re.sub('%s','?',q)
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
if __name__== "__main__":
# just print the default queries and exit
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git Conflicts: pyfpdb/HandHistoryConverter.py pyfpdb/SQL.py
2009-08-12 11:26:42 +02:00
s = Sql()
trying to get my new install of git to freaking work
2009-08-12 11:09:04 +02:00
for key in s.query:
print "For query " + key + ", sql ="
print s.query[key]
Reference in New Issue Copy Permalink