evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some sqlite and unicode issues (thanks to Gerko)

Browse Source
This commit is contained in:
sqlcoder 2010-01-31 23:46:51 +00:00
parent 002a84ba5a
commit 264b75b5b0
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyfpdb/Filters.py
View File

@ -297,7 +297,8 @@ class Filters(threading.Thread):
def __set_hero_name(self, w, site): def __set_hero_name(self, w, site):
_name = w.get_text() _name = w.get_text()
_guiname = Charset.to_gui(_name) # get_text() returns a str but we want internal variables to be unicode:
_guiname = unicode(_name)
self.heroes[site] = _guiname self.heroes[site] = _guiname
# print "DEBUG: setting heroes[%s]: %s"%(site, self.heroes[site]) # print "DEBUG: setting heroes[%s]: %s"%(site, self.heroes[site])

2
pyfpdb/GuiGraphViewer.py
View File

@ -319,7 +319,7 @@ class GuiGraphViewer (threading.Thread):
winnings = self.db.cursor.fetchall() winnings = self.db.cursor.fetchall()
self.db.rollback() self.db.rollback()
if winnings == (): if len(winnings) == 0:
return (None, None, None) return (None, None, None)
green = map(lambda x:float(x[1]), winnings) green = map(lambda x:float(x[1]), winnings)

2
pyfpdb/SQL.py
View File

@ -2021,6 +2021,7 @@ class Sql:
elif db_server == 'sqlite': elif db_server == 'sqlite':
self.query['playerDetailedStats'] = """ self.query['playerDetailedStats'] = """
select <hgameTypeId> AS hgametypeid select <hgameTypeId> AS hgametypeid
,<playerName> AS pname
,gt.base ,gt.base
,gt.category AS category ,gt.category AS category
,upper(gt.limitType) AS limittype ,upper(gt.limitType) AS limittype
@ -2072,6 +2073,7 @@ class Sql:
inner join Hands h on (h.id = hp.handId) inner join Hands h on (h.id = hp.handId)
inner join Gametypes gt on (gt.Id = h.gameTypeId) inner join Gametypes gt on (gt.Id = h.gameTypeId)
inner join Sites s on (s.Id = gt.siteId) inner join Sites s on (s.Id = gt.siteId)
inner join Players p on (p.Id = hp.playerId)
where hp.playerId in <player_test> where hp.playerId in <player_test>
<game_test> <game_test>
/*and hp.tourneysPlayersId IS NULL*/ /*and hp.tourneysPlayersId IS NULL*/