evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,499 Commits 1 Branch 0 Tags 14 MiB
ae27bf7f38
Commit Graph

384 Commits

Author SHA1 Message Date
Mika Bostrom
6f536d29e7 Fix import on PostgreSQL 
Database.py : fillDefaultData()

Remove manual 'id' from INSERT command. In database schema,
TourneyTypes.id is a primary key and thus autoincrement. In postgres,
autoincrements are implemented as sequences - inserting a value
"manually" bypasses the sequence generation, which resulted in a
remarkably weird error.

Namely, upon the first hand to import, the insert fails due to primary
key violation. The default value from an unused sequence is 1, but a
row with such an id already exists.

The solution is to create the single row of default data values with
unspecified TourneyTypes.id, hence allowing postgres to generate the
correct id from the sequence. This way the import works again.
 2009-09-24 07:08:32 +03:00
sqlcoder
23f56ea2ae 2 changes: move recognisePlayerIDs from fpdb_simple into Database, and make index on siteTourneyNo on Tourneys table unique and refine store_tourneys function to handle this 2009-09-23 23:03:34 +01:00
Mika Bostrom
00f8b34fff Simplify database creation 
Database.py : fillDefaultData()

Sql-coder had fixed the default data insert, and in the process changed
the default type ID. Since his works in general case, I can remove my
modifications.
 2009-09-23 23:36:17 +03:00
Worros
a20bfe0921 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-09-23 13:22:45 +08:00
Worros
4e361e383c Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-09-23 13:22:35 +08:00
sqlcoder
e080ec3fd1 further fix to tourneytypes insert for postgres 2009-09-22 22:08:42 +01:00
sqlcoder
455e92e6f6 fix tourneytypes insert for postgres 2009-09-22 22:04:05 +01:00
Worros
89f86dd32b Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-09-22 12:35:11 +08:00
Mika Bostrom
1351cd6dd9 Use cleaner syntax in fillDefaultData 2009-09-21 15:31:19 +03:00
Worros
2cea6f01b9 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-09-19 19:25:01 +08:00
Worros
577beed942 Prep new function - commented out for the moment 2009-09-19 19:24:07 +08:00
Mika Bostrom
e54c45b7d1 Fix database creation with Postgres 
* Database.py : fillDefaultData()

PostgreSQL has a rather annoying (mis)feature when dealing with boolean
data types: raw 1/0 input as integer is not automatically cast to
boolean values. Instead, one must use one of several other ways of
signifying true/false.
http://www.postgresql.org/docs/8.4/static/datatype-boolean.html
documents the available and understood formatting.

Fix by special-casing PostgreSQL and making all boolean values fed as
strings, '1' for true and '0' for false.
 2009-09-19 11:44:06 +03:00
Eric Blade
a1783a37cb reflow init_hud_stat_vars exception handling 2009-09-15 21:04:00 -05:00
Eric Blade
8b19750b1f == None to is None (PEP 8, Style Guide for Python Code) 2009-09-15 19:27:25 -05:00
Eric Blade
4374b6c810 remove Database:__init__ parameters for db_name and game, as there was a comment right next to them # db_name and game not used anymore 2009-09-15 18:49:34 -05:00
Ray
e69cbc30ea Merge branch 'master' of git://git.assembla.com/fpt_fpdb 2009-09-11 10:05:22 -04:00
PassThePeas
49ce7de254 Patch for HandsPlayers.TourneyTypeId not being null (even in ring context) for hudcache / Extend tourneyName size in TourneysTable 2009-09-07 00:18:10 +02:00
Ray
88d33dd4f4 Merge branch 'master' of git://git.assembla.com/mctfpdb 2009-09-04 18:08:06 -04:00
Matt Turnbull
b40132e961 db can be specified in cmd line option again 2009-09-04 22:12:35 +01:00
Ray
d80318d950 Fix small case sensitive bug. 2009-09-04 16:43:55 -04:00
Eric Blade
9fa57b6014 Database: re-write and fix drop_tables 
Exceptions: add FpdbDatabaseError
SQL: default all tourneytypeids to 1
fpdb_import: import error tuples set to right size
 2009-09-04 06:49:46 -05:00
Worros
4f98b29b26 Merge branch 'master' of git://git.assembla.com/fpt_fpdb 
Conflicts:
	pyfpdb/Database.py
 2009-09-04 12:45:49 +08:00
PassThePeas
91ebbe79e1 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
PassThePeas
d28f56db18 Tourney import : tRecognizeTourney implemented (search, update or insert a Tourney 2009-09-02 22:55:47 +02:00
PassThePeas
b00a58249f Tourney import : tRecogniseTourneyType implemented 
modified:   Database.py
	* tRecogniseTourneyType : implemented
	modified:   FulltiltToFpdb.py
	* buyin, fee, rebuyAmount, addOnAmount : converted using fpdb_simple.float2int
	modified:   SQL.py
	* Added queries for Database.tRecogniseTourneyType (getTourneyTypeIdByTourneyNo modified to return all data, getTourneyTypeId and insertTourneyTypes added)
 2009-09-01 02:35:52 +02:00
PassThePeas
3323d25ce7 Patch for handsplayers.tourneyTypeId and preparation for Tourney import 
modified:   Database.py
		* correct the HandsPlayers.tourneyTypeId entry (null for omaha/he ring games, correct value instead of 1 or null for omaha/he & stud tourneys)
		* add prototypes and description of new methods to store Tourneys info
	modified:   Tourney.py
		* add calls to new methods in Tourney.insert
 2009-08-31 01:30:28 +02:00
Matt Turnbull
d2380ba738 merge from futz2 branch 2009-08-28 18:24:51 +01:00
Matt Turnbull
09350e8f52 Database.py - need os. Hand.py - encoding, and writeHTML doesn't need fh 2009-08-28 01:22:08 +01:00
PassThePeas
0217e2320c DB Model changes to prepare for Tourney Summary import 
modified:   Database.py
		* fillDefaultData : queries that inserts the default line into TourneyTypes rewritten (simplified to take into account the columns that have "new" DEFAULT attribute)
	modified:   SQL.py
		* createTourneyTypesTable query modified : some existing columns are now created with a default values, new columns added
		* createTourneysTable query modified : new columns added
		* createTourneysPlayersTable query modified : new columns added
 2009-08-27 01:41:04 +02:00
Matt Turnbull
29a0ad85c7 full path to logging.config, small fix in Configuration.Database string repr 2009-08-15 22:36:14 +01:00
Worros
5a4bcf3997 Add streetXPot and showdownPot to hhc insert 
totalPot not actually calcuated yet, and valued need to be converted from Decimal() to cents
 2009-08-12 22:21:54 +08:00
Matt Turnbull
222d713169 too much changes to go into master 2009-08-12 01:46:39 +01:00
Worros
24e5c2252d Fix inserting into Gametypes 2009-08-11 20:52:07 +08:00
Worros
d6529ab42f Import Hand.insert() work 
storeHand updated, almost works, just violating some NOT NULL contraints
 2009-08-09 01:59:44 +08:00
Worros
5550166f37 Start of storeHand from HHC code 
Currently cant actually insert as we need the fk gametypeid
 2009-08-08 16:15:36 +08:00
Worros
679393e78d Minor change to insertPlayer() 2009-08-08 14:59:23 +08:00
Worros
470d34c65c Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-08 13:06:41 +08:00
Worros
08a70b75f2 Fix insertPlayer so that it works again 2009-08-08 12:33:25 +08:00
sqlcoder
d292cd18d4 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-07 00:12:22 +01:00
sqlcoder
126dfd7331 get hudcache update to work for sqlite - hud now working! 2009-08-07 00:04:44 +01:00
sqlcoder
6de41be9c9 mainly sqlite fixes, also removed not null on many hudcache columns 2009-08-06 20:31:46 +01:00
grindi
054abfc178 Merge branch 'party' 
Conflicts:
	pyfpdb/Database.py
	pyfpdb/Hand.py
	pyfpdb/PartyPokerToFpdb.py
 2009-08-06 18:44:03 +04:00
Worros
d043368c88 Prep for PartyPoker plugin add 2009-08-06 20:54:39 +08:00
Worros
5f5825e30b Add additional siteids to default data insert 2009-08-06 10:18:48 +08:00
Worros
2a3a5f0601 Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:
	pyfpdb/Database.py
 2009-08-06 09:20:10 +08:00
eblade
34c469ab3a Add AbsoluteToFpdb.py 
Database: Add Absolute to sites
GuiPlayerStats: set avgseats to False
Hand: Add Absolute to SITEIDS list
fpdb_import: check for presence of settings['dropHudCache'] before testing it, to keep command line import from erroring
 2009-08-05 21:07:16 -04:00
grindi
ebe652d49e Added PartyPoker into Database.py 2009-08-05 20:58:25 +04:00
sqlcoder
b7a718d786 some more sqlite work 2009-08-04 23:17:31 +01:00
sqlcoder
fe62e78c5b mods for sqlite 2009-08-04 22:06:03 +01:00
Worros
5e66e48b75 Some comments and cleanup to the recent Player insert code 2009-08-04 18:22:29 +08:00
Worros
7050df10c2 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-08-04 08:34:21 +08:00
sqlcoder
5a94f16d16 fix typo in column name 2009-08-03 19:15:36 +01:00
Worros
47595ecfef Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-08-03 09:35:37 +08:00
Worros
6781d97539 Remove debug message 2009-08-03 09:35:22 +08:00
sqlcoder
745baf139f Sorry guys. Added some error checking and discovered a bug in the mysql index creation - I've fixed it and imports don't degrade anything like they used to now. I've just imported 15K hands at 20+/second when it used to be down at 5/sec after 10K hands or so. 2009-08-03 01:30:51 +01:00
sqlcoder
1a63c62cf1 Merge branch 'master' of git://git.assembla.com/fpdboz 2009-08-02 22:50:31 +01:00
sqlcoder
8e0519708e fix bugs and move hud stat config to HUD_main.py so that GUI can set it 2009-08-02 13:00:55 +01:00
Worros
ff2cca361c New insert player function for HHC import 
Added getSqlPlayerIDs to Database.py - returns a hash {playername:sqlid}

Function uses a caching hash in Database.py to reduce the number of round trips to the database needed just to fetch the player ids for later inserts.

Need to do a performance comparison on a larger import.
 2009-08-02 12:19:33 +08:00
sqlcoder
e2dde5c3e3 fix aggregate query and stop hud queries being executed whenever anything created a db connection 2009-08-01 23:15:04 +01:00
sqlcoder
e9873d38a5 fix sleep() call 2009-08-01 00:06:07 +01:00
sqlcoder
36f09ebc82 merge from ray @f5ba0b5b7... 2009-07-31 21:58:39 +01:00
sqlcoder
b503626c2b add db writer threading 2009-07-31 21:24:21 +01:00
eblade
f5ba0b5b7f Database: insert missing HandToWrite.payin_amounts var 
EverleafToFpdb: remove DEBUG XXXXXXX line
FulltiltToFpdb: pass on converting tournament hands
Hand: add Hand.fee var that Database is looking for
fpdb_import: clean up file update scan code, queue files that have changed in the last 60 seconds for the next importer pass, instead of locking it up reading them now (not that this does anything since FT no longer updates the mtime until it closes the table, but maybe it works with Stars or others)
 2009-07-30 21:50:08 -04:00
sqlcoder
c2f79ddc24 refine mysql index drop/creation, but redundant as have left Erics new commands in - mysql crawls with 10k hands! get postgres :-) 2009-07-29 07:57:18 +01:00
sqlcoder
9c62ecb80e debug move to Database.py and move last part of mainparser into Database.py 2009-07-29 06:17:51 +01:00
sqlcoder
298de5dc15 move most stuff from fpdb_db.py to Database.py and simplify db connections in fpdb_import 2009-07-28 23:58:10 +01:00
sqlcoder
12e1da0a5e add lock_for_insert routine but comment out for now (hangs) 2009-07-28 21:19:31 +01:00
sqlcoder
f45038673c more moves into Database.py, better exception handling, store hudcache stats for holdem tourneys (some maybe no use? it's a start anyway - need to add NL/FL switch on Filter) 2009-07-26 01:42:09 +01:00
sqlcoder
9c9202b539 remove debug statement 2009-07-22 20:22:20 +01:00
sqlcoder
ab004b8284 only update psycopg2 extensions when using it 2009-07-22 20:19:41 +01:00
sqlcoder
f69281e2fd finish hudcache rebuild code which speeds up bulk imports nicely - turn off permanently via allow_hudcache_rebuild in fpdb_import.py. Also some more moves into Database.py and cosmetic stuff 2009-07-21 22:26:23 +01:00
sqlcoder
0fecdfb2d7 make positional stats use Database.py 2009-07-19 18:28:13 +01:00
sqlcoder
cdd94d512f improve handling of hud_style options 2009-07-18 18:29:06 +01:00
Worros
ec9ce544ca Fix if database hasn't been created yet. 
Still broken on my setup, but at least fpdb now starts
 2009-07-15 23:32:17 +08:00
Ray
7d97365fbf Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-07-02 10:11:23 -04:00
Ray
97520bfee9 Fix call to StoreHands for stud games. 2009-07-01 13:55:12 -04:00
sqlcoder
cb1a4d2d0a add wrappers for fpdb_db methods (plan is to move the fpdb_db methods into Database) 2009-06-30 22:00:55 +01:00
sqlcoder
dc7a3fb88e finish removal of store_board_cards() 2009-06-28 18:56:18 +01:00
sqlcoder
a2db28ebf2 create Database instance in import to pass into parser - will eventually replace fpdb_db 2009-06-25 23:14:32 +01:00
sqlcoder
9b50987d0c add sql param to Database constructor - aim is to have just one SQL instance passed around and to use Database for db connections and methods 2009-06-23 23:44:37 +01:00
Ray
24b7af5703 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-23 10:23:05 -04:00
Ray
0bf39dbcf6 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/fpdb_import.py
 2009-06-23 10:04:23 -04:00
sqlcoder
45a9358cbd set defaults for unused params to allow new calls without needing to set them 2009-06-22 23:16:34 +01:00
Worros
d00031edf7 Add get_last_insert_id() to Database API 2009-06-20 06:22:57 +08:00
Worros
2569eeddc8 Remve legacy storeHudCache function 2009-06-20 05:37:30 +08:00
Worros
2b3e507a3c Factor out some common code 2009-06-20 05:33:33 +08:00
Worros
f1921bebde Move functions from fpdb_save_to_db into Database.py 
Doesn't actually do much cleanup.

Intend on moving all db functions into Database.py and fpdb_db.py and
providing and API, the functionality of fpdb_simple et all to shift into
the HHC
 2009-06-20 04:15:52 +08:00
Ray
a998a6dc6e Merge branch 'master' of git://git.assembla.com/fpdboz 2009-06-19 16:10:44 -04:00
Ray
a307081574 More for Flop_Mucked with 0-52 encoding. 2009-06-19 15:51:56 -04:00
Worros
966fba2165 Fix parameter being passed to Sql __init__ db_server not db_backend 2009-06-20 01:17:06 +08:00
Worros
ccd2112c8a Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-06-20 00:41:24 +08:00
sqlcoder
7664373648 use fpdb_db for db connection 2009-06-17 23:03:43 +01:00
Ray
4a6c257b0f get_cards query now works directly with the 0-52 card encoding scheme. 2009-06-16 23:00:46 -04:00
Ray
f3103cc82a Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Database.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_save_to_db.py
 2009-06-09 14:01:15 -04:00
Worros
8a55b2ebd9 Remove merge line 2009-06-09 23:10:11 +08:00
Worros
c3d2c5a2be Merge branch 'master' of git://git.assembla.com/free_poker_tools 
Conflicts:

	pyfpdb/Database.py
	pyfpdb/SQL.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_save_to_db.py

Also fix datetime issue with Everleaf
 2009-06-09 22:48:48 +08:00
Ray
4ef4260342 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:
	pyfpdb/Database.py
	pyfpdb/SQL.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_save_to_db.py
 2009-06-08 10:16:34 -04:00
Ray
9826138744 Correctly hand remote and local postgres dbs. Use get_db_parmeters(). 2009-06-01 18:27:56 -04:00
Ray
069aa025e4 Fixes for importing and HUD with the postgres db. 2009-05-31 21:25:36 -04:00
sqlcoder
060c102843 changes to store date in hudcache.stylekey and display all-time / session / n days stats in hud 2009-05-27 23:34:10 +01:00
sqlcoder
07247de030 changes to allow hud to use stylekey and aggregate stats query 2009-05-21 21:27:44 +01:00
sqlcoder
cf8b6c7e92 several db changes and a fancy playerstats window, now to tidy the code up a bit .... 2009-05-21 04:26:00 +01:00
sqlcoder
1b82ad7f65 re-fix a couple of errors from previous merges 2009-05-03 01:24:10 +01:00
sqlcoder
7d28f70a98 pull and merge from fpdboz 2009-05-02 21:02:26 +01:00
sqlcoder
2c991ad2d0 sql and cursor execute bugfixes to make it work with postgres 2009-05-02 00:28:53 +01:00
sqlcoder
d6ebd9352d pull from Ray (I think this was release 0.11) 2009-04-29 23:05:29 +01:00
Worros
6504cd38a6 use lower case for keys into stat_dict as postgres returns column names in lower case 
Conflicts:

	pyfpdb/Database.py
 2009-04-30 00:16:39 +08:00
sqlcoder
2efc6f1c8e use lower case for keys into stat_dict as postgres returns column names in lower case 2009-04-27 21:29:02 +01:00
Ray
2ac4e26337 Merge branch 'master' of git://git.assembla.com/fpdboz 
Conflicts:

	pyfpdb/Database.py
 2009-03-12 12:13:03 -04:00
eblade
fbbd2c4d5c asdfsadfsadfasdfsadf 2009-03-12 00:10:34 -04:00
Ray
6bf7be6ae5 Merge branch 'master' of git://git.assembla.com/fpdb-eric 
Conflicts:

	pyfpdb/Configuration.py
	pyfpdb/Database.py
 2009-03-11 22:46:28 -04:00
eblade
27e0df2a24 Merge branch 'master' of git://git.assembla.com/fpdboz.git 
Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py
 2009-03-11 22:41:43 -04:00
eblade
375c2555a2 still fixing convert_cards.. god i'm retarded lol 2009-03-11 06:38:17 -04:00
eblade
52db43cd6b fix my further screwed up convert_cards function.. 2009-03-11 06:31:47 -04:00
eblade
1653dcf34c fix error i made in convertcards 2009-03-10 20:19:33 -04:00
eblade
388525ed30 Merge branch 'master' of git://git.assembla.com/free_poker_tools.git 
Conflicts:
	pyfpdb/Database.py
 2009-03-10 19:31:42 -04:00
Worros
e87118e9ae Make PLO work on Everleaf again 2009-03-11 00:14:23 +09:00
Ray
3d6bd0eb46 New query: get common cards for mucked card display. 2009-03-09 11:37:34 -04:00
eblade
7a6684699a remove string concat from fairly highly used convert_cards() func 2009-03-09 05:06:36 -04:00
Ray
333cbdbf6d Speed and reliability changes (+cleanup) to aux window interface. 2009-02-25 23:35:15 -05:00
Ray
f1530860d2 Fixed problem with unreliable fav_seat placement. 
Eliminated special query to get actual seat by
incorporating in to stat_dict query. Provided for
graceful skipping of hands when there is an error
in a query in the read_stdin() thread. Left
intermediate prints for use of others.
 2009-02-23 21:33:23 -05:00
Ray
fcd70293fb minor formatting changes 2009-01-12 19:21:43 -05:00
Ray
7d75e4af91 Add winner and pot to Mucked list list box + intfac imp. 2008-12-08 14:10:45 -05:00
Ray
ca960cad96 Support for the mucked cards window. Still a bug in the card storing. 2008-11-12 22:45:09 -05:00
Ray
036729b8c2 Support tournaments 2008-11-11 09:50:20 -05:00
Ray
cf1efb8d27 transaction isolation code suggested by sql_coder on the forums 2008-11-05 22:44:29 -05:00
Ray
7990094835 added support for favorite seat on Stars 2008-10-09 20:50:12 -04:00
Ray
3b618723d2 fix bug in saving layouts 2008-10-04 15:43:50 -05:00
steffen123
b549aa2605 p107 - HUD updates from ray, FTP now supported 2008-09-26 14:18:47 +01:00
steffen123
7dcf2d9bbc p83 - corrected silly mistake i made in p82 2008-09-17 01:21:55 +01:00
steffen123
cd212af029 p82 - made import of SQL interface libraries into try-except loop to facilitate choosing between mysql and pgsql 2008-09-16 22:19:50 +01:00
steffen123
7b13331331 p80 - a great many updates from Ray 2008-09-15 21:31:55 +01:00
steffen123
66d938accc p62 - major patch from ray with new stats in HUD 
added db todo file with the things that are left for the db
 2008-08-20 20:29:08 +01:00
steffen123
c716dfd35e p58 - added HUD from ray 
fpdb_parse now returns hand id rather than site hand no
 2008-08-18 23:53:25 +01:00