From 126dfd7331b4faed0c4018e95c17ad66f91d5ed2 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Fri, 7 Aug 2009 00:04:44 +0100
Subject: [PATCH] get hudcache update to work for sqlite - hud now working!

---
 pyfpdb/Database.py | 17 +++++++++++------
 pyfpdb/SQL.py      | 13 +++++++++----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 5c071a85..dd13e637 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -971,12 +971,14 @@ class Database:
 
         try:
             stime = time()
-            self.connection.cursor().execute(self.sql.query['clearHudCache'])
-            self.connection.cursor().execute(self.sql.query['rebuildHudCache'])
+            self.get_cursor().execute(self.sql.query['clearHudCache'])
+            self.get_cursor().execute(self.sql.query['rebuildHudCache'])
             self.commit()
             print "Rebuild hudcache took %.1f seconds" % (time() - stime,)
         except:
+            err = traceback.extract_tb(sys.exc_info()[2])[-1]
             print "Error rebuilding hudcache:", str(sys.exc_value)
+            print err
     #end def rebuild_hudcache
 
 
@@ -1616,11 +1618,14 @@ class Database:
                                       row[56], row[57], row[58], row[59], row[60],
                                       row[1], row[2], row[3], str(row[4]), row[5], styleKey))
                 # Test statusmessage to see if update worked, do insert if not
-                #print "storehud2, upd num =", num
+                #print "storehud2, upd num =", num.rowcount
+                # num is a cursor in sqlite
                 if (   (backend == self.PGSQL and cursor.statusmessage != "UPDATE 1")
-                    or (backend == self.MYSQL_INNODB and num == 0) ):
+                    or (backend == self.MYSQL_INNODB and num == 0) 
+                    or (backend == self.SQLITE and num.rowcount == 0) 
+                   ):
                     #print "playerid before insert:",row[2]," num = ", num
-                    cursor.execute("""INSERT INTO HudCache
+                    num = cursor.execute("""INSERT INTO HudCache
     (gametypeId, playerId, activeSeats, position, tourneyTypeId, styleKey,
     HDs, street0VPI, street0Aggr, street0_3BChance, street0_3BDone,
     street1Seen, street2Seen, street3Seen, street4Seen, sawShowdown,
@@ -1651,7 +1656,7 @@ class Database:
                                     ,row[31], row[32], row[33], row[34], row[35], row[36], row[37], row[38], row[39], row[40]
                                     ,row[41], row[42], row[43], row[44], row[45], row[46], row[47], row[48], row[49], row[50]
                                     ,row[51], row[52], row[53], row[54], row[55], row[56], row[57], row[58], row[59], row[60]) )
-                    #print "hopefully inserted hud data line: ", cursor.statusmessage
+                    #print "hopefully inserted hud data line: ", cursor.rowcount
                     # message seems to be "INSERT 0 1"
                 else:
                     #print "updated(2) hud data line"
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index a5be2878..18eaad5c 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -1667,6 +1667,11 @@ class Sql:
                     select coalesce(max(id),0)
                     from Hands
                     where handStart < now() at time zone 'UTC' - interval '1 day'"""
+            elif db_server == 'sqlite':
+                self.query['get_hand_1day_ago'] = """
+                    select coalesce(max(id),0)
+                    from Hands
+                    where handStart < strftime('%J', 'now') - 1"""
 
             # not used yet ...
             # gets a date, would need to use handsplayers (not hudcache) to get exact hand Id
@@ -2105,7 +2110,7 @@ class Sql:
                                when stats.PlPosition =  1 then 'CO'
                                when stats.PlPosition =  2 then 'MP'
                                when stats.PlPosition =  5 then 'EP'
-                               else '??'
+                               else 'xx'
                           end                                                          AS PlPosition
                          ,stats.n
                          ,stats.vpip
@@ -2239,7 +2244,7 @@ class Sql:
                                 when stats.PlPosition =  1 then 'CO'
                                 when stats.PlPosition =  2 then 'MP'
                                 when stats.PlPosition =  5 then 'EP'
-                                else '??'
+                                else 'xx'
                            end                                                          AS PlPosition
                           ,stats.n
                           ,stats.vpip
@@ -2767,7 +2772,7 @@ class Sql:
                                 else 'E'
                            end                                            AS hc_position
                           ,hp.tourneyTypeId
-                          ,'d' || substr(strftime('%Y%m%d', h.handStart),3)
+                          ,'d' || substr(strftime('%Y%m%d', h.handStart),3,7)
                           ,count(1)
                           ,sum(wonWhenSeenStreet1)
                           ,sum(wonAtSD)
@@ -2830,7 +2835,7 @@ class Sql:
                             ,h.seats
                             ,hc_position
                             ,hp.tourneyTypeId
-                            ,'d' || substr(strftime('%Y%m%d', h.handStart),3)
+                            ,'d' || substr(strftime('%Y%m%d', h.handStart),3,7)
 """
 
             if db_server == 'mysql':