Replace raw SQL query by PicoDb

2 files changed, 3 insertions, 9 deletions

diff --git a/app/Model/ProjectActivity.php b/app/Model/ProjectActivity.php
index 309bab9a..d3aeefe5 100644
--- a/app/Model/ProjectActivity.php
+++ b/app/Model/ProjectActivity.php
@@ -169,14 +169,8 @@ class ProjectActivity extends Base
     public function cleanup($max)
     {
         if ($this->db->table(self::TABLE)->count() > $max) {
-            $this->db->execute('
-                DELETE FROM '.self::TABLE.'
-                WHERE id <= (
-                    SELECT id FROM (
-                        SELECT id FROM '.self::TABLE.' ORDER BY id DESC LIMIT 1 OFFSET '.$max.'
-                    ) foo
-                )'
-            );
+            $subquery = $this->db->table(self::TABLE)->desc('id')->limit($max)->columns('id');
+            $this->db->table(self::TABLE)->notInSubquery('id', $subquery)->remove();
         }
     }
 
diff --git a/app/Model/ProjectDailyColumnStats.php b/app/Model/ProjectDailyColumnStats.php
index c4a3f28e..83475246 100644
--- a/app/Model/ProjectDailyColumnStats.php
+++ b/app/Model/ProjectDailyColumnStats.php
@@ -159,7 +159,7 @@ class ProjectDailyColumnStats extends Base
      * @param  string  $day
      * @param  string  $column_id
      * @param  string  $field
-     * @return array
+     * @return integer
      */
     private function findValueInMetrics(array &$metrics, $day, $column_id, $field)
     {