Add back in sqlcoders changes for sqlite - fix Grapher

pyfpdb/GuiGraphViewer.py

@@ -20,6 +20,7 @@ import pygtk
 pygtk.require('2.0')
 import gtk
 import os
+import traceback
 from time import *
 #import pokereval
 

pyfpdb/fpdb_parse_logic.py

@@ -93,7 +93,7 @@ def mainParser(settings, siteID, category, hand, config, db = None, writeq = Non
             seatLines.append(line)
 
     names       = fpdb_simple.parseNames(seatLines)
-    playerIDs   = fpdb_simple.recognisePlayerIDs(db.get_cursor(), names, siteID)  # inserts players as needed
+    playerIDs   = fpdb_simple.recognisePlayerIDs(db, names, siteID)  # inserts players as needed
     tmp         = fpdb_simple.parseCashesAndSeatNos(seatLines)
     startCashes = tmp['startCashes']
     seatNos     = tmp['seatNos']

pyfpdb/fpdb_simple.py

@@ -984,14 +984,17 @@ def recogniseTourneyTypeId(cursor, siteId, buyin, fee, knockout, rebuyOrAddon):
 #        result.append(tmp[0][0])
 #    return result
 
-def recognisePlayerIDs(cursor, names, site_id):
-    q = "SELECT name,id FROM Players WHERE siteid=%d and (name=%s)" % (site_id, " OR name=".join(["%s" for n in names]))
-    cursor.execute(q, names) # get all playerids by the names passed in
-    ids = dict(cursor.fetchall()) # convert to dict
+def recognisePlayerIDs(db, names, site_id):
+    c = db.get_cursor()
+    q = "SELECT name,id FROM Players WHERE siteid=%d and (name=%s)" %(site_id, " OR name=".join([db.sql.query['placeholder'] for n in names]))
+    c.execute(q, names) # get all playerids by the names passed in
+    ids = dict(c.fetchall()) # convert to dict
     if len(ids) != len(names):
         notfound = [n for n in names if n not in ids] # make list of names not in database
         if notfound: # insert them into database
-            c.executemany("INSERT INTO Players (name, siteId) VALUES (%s, "+str(site_id)+")", [(n,) for n in notfound])
+            q_ins = "INSERT INTO Players (name, siteId) VALUES (%s, "+str(site_id)+")"
+            q_ins = q_ins.replace('%s', db.sql.query['placeholder'])
+            c.executemany(q_ins, [(n,) for n in notfound])
             q2 = "SELECT name,id FROM Players WHERE siteid=%d and (name=%s)" % (site_id, " OR name=".join(["%s" for n in notfound]))
             q2 = q2.replace('%s', db.sql.query['placeholder'])
             c.execute(q2, notfound) # get their new ids