git40 - fixed little bug in table creation and added tourneyGametypeId to the cache to make tourney caching more sensible.

This commit is contained in:
steffen123 2008-08-16 07:16:50 +01:00
parent 701a824ac6
commit 16be2b39f9
6 changed files with 16 additions and 10 deletions

View File

@ -24,7 +24,7 @@ Once finished it shold confirm "service started successfully"
1b. MySQL database and user setup 1b. MySQL database and user setup
Now open a shell (aka command prompt aka DOS window): Now open a shell (aka command prompt aka DOS window):
Click Start, then Run. In the opening window type "cmd" (without the inverted commas) and then click OK. A windows with a black background should open. Click Start, then Run. In the opening window type "cmd" (without the inverted commas) and then click OK. A window with a black background should open.
Type (replacing yourPassword with the root password for MySQL you specified during installation): Type (replacing yourPassword with the root password for MySQL you specified during installation):
mysql --user=root --password=yourPassword mysql --user=root --password=yourPassword

View File

@ -547,6 +547,11 @@ The program itself is licensed under AGPLv3, see agpl-3.0.txt</p>
<TD><P>position</P></TD> <TD><P>position</P></TD>
<TD><P>char(1)</P></TD> <TD><P>char(1)</P></TD>
<TD><P>Position for which this row applies. In this table this can be B(BB), S(SB), D(Dealer/Button), C(Cutoff), M(Middle - the 3 before cutoff) or E (Early - the 3 before Middle)</P></TD> <TD><P>Position for which this row applies. In this table this can be B(BB), S(SB), D(Dealer/Button), C(Cutoff), M(Middle - the 3 before cutoff) or E (Early - the 3 before Middle)</P></TD>
<TR VALIGN=TOP>
<TD><P>tourneysGametypeId</P></TD>
<TD><P>smallint</P></TD>
<TD><P>References TourneysGametypes.id</P></TD>
</TR>
</TR> </TR>
</TABLE> </TABLE>
<P></P> <P></P>
@ -617,9 +622,9 @@ The program itself is licensed under AGPLv3, see agpl-3.0.txt</p>
<TD><P><BR></P></TD> <TD><P><BR></P></TD>
</TR> </TR>
<TR VALIGN=TOP> <TR VALIGN=TOP>
<TD><P>tourneyGametypeId</P></TD> <TD><P>tourneysGametypeId</P></TD>
<TD><P>smallint</P></TD> <TD><P>smallint</P></TD>
<TD><P>References TourneyGametypes.id</P></TD> <TD><P>References TourneysGametypes.id</P></TD>
</TR> </TR>
<TR VALIGN=TOP> <TR VALIGN=TOP>
<TD><P>siteTourneyNo</P></TD> <TD><P>siteTourneyNo</P></TD>

View File

@ -363,7 +363,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
self.window.connect("delete_event", self.delete_event) self.window.connect("delete_event", self.delete_event)
self.window.connect("destroy", self.destroy) self.window.connect("destroy", self.destroy)
self.window.set_title("Free Poker DB - version: alpha1+, git39") self.window.set_title("Free Poker DB - version: alpha1+, git40")
self.window.set_border_width(1) self.window.set_border_width(1)
self.window.set_size_request(1020,400) self.window.set_size_request(1020,400)
self.window.set_resizable(True) self.window.set_resizable(True)

11
pyfpdb/fpdb_db.py Executable file → Normal file
View File

@ -47,7 +47,7 @@ class fpdb_db:
try: try:
self.cursor.execute("SELECT * FROM Settings") self.cursor.execute("SELECT * FROM Settings")
settings=self.cursor.fetchone() settings=self.cursor.fetchone()
if settings[0]!=39: if settings[0]!=40:
print "outdated database version - please recreate tables" print "outdated database version - please recreate tables"
except:# _mysql_exceptions.ProgrammingError: except:# _mysql_exceptions.ProgrammingError:
print "failed to read settings table - please recreate tables" print "failed to read settings table - please recreate tables"
@ -119,11 +119,11 @@ class fpdb_db:
self.cursor.execute("DROP TABLE IF EXISTS HandsActions;") self.cursor.execute("DROP TABLE IF EXISTS HandsActions;")
self.cursor.execute("DROP TABLE IF EXISTS HandsPlayers;") self.cursor.execute("DROP TABLE IF EXISTS HandsPlayers;")
self.cursor.execute("DROP TABLE IF EXISTS Hands;") self.cursor.execute("DROP TABLE IF EXISTS Hands;")
self.cursor.execute("DROP TABLE IF EXISTS TourneysGametypes;")
self.cursor.execute("DROP TABLE IF EXISTS TourneysPlayers;") self.cursor.execute("DROP TABLE IF EXISTS TourneysPlayers;")
self.cursor.execute("DROP TABLE IF EXISTS Tourneys;") self.cursor.execute("DROP TABLE IF EXISTS Tourneys;")
self.cursor.execute("DROP TABLE IF EXISTS Players;") self.cursor.execute("DROP TABLE IF EXISTS Players;")
self.cursor.execute("DROP TABLE IF EXISTS Gametypes;") self.cursor.execute("DROP TABLE IF EXISTS Gametypes;")
self.cursor.execute("DROP TABLE IF EXISTS TourneysGametypes;")
self.cursor.execute("DROP TABLE IF EXISTS Sites;") self.cursor.execute("DROP TABLE IF EXISTS Sites;")
self.db.commit() self.db.commit()
@ -206,7 +206,7 @@ class fpdb_db:
card5Suit char(1))""") card5Suit char(1))""")
self.create_table("""TourneysGametypes ( self.create_table("""TourneysGametypes (
id INT UNSIGNED UNIQUE AUTO_INCREMENT, PRIMARY KEY (id), id SMALLINT UNSIGNED UNIQUE AUTO_INCREMENT, PRIMARY KEY (id),
siteId SMALLINT UNSIGNED, FOREIGN KEY (siteId) REFERENCES Sites(id), siteId SMALLINT UNSIGNED, FOREIGN KEY (siteId) REFERENCES Sites(id),
buyin INT, buyin INT,
fee INT, fee INT,
@ -313,9 +313,10 @@ class fpdb_db:
thirdBarrelChance INT, thirdBarrelChance INT,
thirdBarrelDone INT, thirdBarrelDone INT,
position CHAR(1))""") position CHAR(1),
tourneysGametypeId SMALLINT UNSIGNED, FOREIGN KEY (tourneysGametypeId) REFERENCES TourneysGametypes(id))""")
self.cursor.execute("INSERT INTO Settings VALUES (39);") self.cursor.execute("INSERT INTO Settings VALUES (40);")
self.cursor.execute("INSERT INTO Sites VALUES (DEFAULT, \"Full Tilt Poker\", 'USD');") self.cursor.execute("INSERT INTO Sites VALUES (DEFAULT, \"Full Tilt Poker\", 'USD');")
self.cursor.execute("INSERT INTO Sites VALUES (DEFAULT, \"PokerStars\", 'USD');") self.cursor.execute("INSERT INTO Sites VALUES (DEFAULT, \"PokerStars\", 'USD');")
self.db.commit() self.db.commit()

0
pyfpdb/import_threaded.py Executable file → Normal file
View File

2
pyfpdb/table_viewer.py Executable file → Normal file
View File

@ -59,7 +59,7 @@ class table_viewer (threading.Thread):
arr=[] arr=[]
#first prepare the header row #first prepare the header row
if (self.category=="holdem" or self.category=="omahahi" or self.category=="omahahilo"): if (self.category=="holdem" or self.category=="omahahi" or self.category=="omahahilo"):
tmp=("Name", "Hands", "VPIP", "PFR", "PF3B4B", "ST") tmp=("Name", "HDs", "VPIP", "PFR", "PF3B4B", "ST")
if self.settings['tv-combinedStealFold']: if self.settings['tv-combinedStealFold']:
tmp+=("FSB", ) tmp+=("FSB", )