@@ -1629,16 +1629,25 @@ func SQLiteRunQueryLive(baseDir, dbOwner, dbName, loggedInUser, query string) (r
1629
1629
}
1630
1630
defer sdb .Close ()
1631
1631
1632
- // TODO: Probably add in the before and after logging info at some point (as per function above),
1633
- // so we can analyse query execution times
1632
+ // Log the SQL query (prior to executing it)
1633
+ logID , err := LogSQLiteQueryBefore ("LIVE api" , dbOwner , dbName , loggedInUser , "-" , "-" , query )
1634
+ if err != nil {
1635
+ return SQLiteRecordSet {}, err
1636
+ }
1634
1637
1635
1638
// Execute the SQLite select query (or queries)
1636
- _ , _ , records , err = SQLiteRunQuery (sdb , QuerySourceAPI , query , false , false )
1639
+ memUsed , memHighWater , records , err : = SQLiteRunQuery (sdb , QuerySourceAPI , query , false , false )
1637
1640
if err != nil {
1638
- log .Printf ("Error when preparing statement by '%s' for LIVE database (%s/%s): '%s'" , SanitiseLogString (loggedInUser ),
1641
+ log .Printf ("Error when running LIVE query by '%s' for LIVE database (%s/%s): '%s'" , SanitiseLogString (loggedInUser ),
1639
1642
SanitiseLogString (dbOwner ), SanitiseLogString (dbName ), SanitiseLogString (err .Error ()))
1640
1643
return SQLiteRecordSet {}, err
1641
1644
}
1645
+
1646
+ // Add the SQLite execution stats to the log record
1647
+ err = LogSQLiteQueryAfter (logID , memUsed , memHighWater )
1648
+ if err != nil {
1649
+ return SQLiteRecordSet {}, err
1650
+ }
1642
1651
return
1643
1652
}
1644
1653
0 commit comments