Fix #12

Fix PostgreSQL and SQLite support
eliseekn · Apr 7, 2024 · 4d8ca38 · 4d8ca38
1 parent c1a8129
commit 4d8ca38
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/DatesFunctions.php b/src/DatesFunctions.php
@@ -60,7 +60,7 @@ protected function formatPeriod(string $period): string
 
         if ($driver === 'mysql') {
             return match ($period) {
-                Period::TODAY->value, Period::DAY->value => "weekday($this->dateColumn)",
+                Period::TODAY->value, Period::DAY->value => "day($this->dateColumn)",
                 Period::WEEK->value => "week($this->dateColumn)",
                 Period::MONTH->value => "month($this->dateColumn)",
                 default => "year($this->dateColumn)",
@@ -69,15 +69,15 @@ protected function formatPeriod(string $period): string
 
         if ($driver === 'pgsql') {
             return match ($period) {
-                Period::TODAY->value, Period::DAY->value => "EXTRACT(DOW FROM $this->dateColumn)",
+                Period::TODAY->value, Period::DAY->value => "EXTRACT(DAY FROM $this->dateColumn)",
                 Period::WEEK->value => "EXTRACT(WEEK FROM $this->dateColumn)",
                 Period::MONTH->value => "EXTRACT(MONTH FROM $this->dateColumn)",
                 default => "EXTRACT(YEAR FROM $this->dateColumn)",
             };
         }
 
         return match ($period) {
-            Period::TODAY->value, Period::DAY->value => "strftime('%w', $this->dateColumn)",
+            Period::TODAY->value, Period::DAY->value => "strftime('%d', $this->dateColumn)",
             Period::WEEK->value => "strftime('%W', $this->dateColumn)",
             Period::MONTH->value => "strftime('%m', $this->dateColumn)",
             default => "strftime('%Y', $this->dateColumn)",

diff --git a/src/LaravelMetrics.php b/src/LaravelMetrics.php
@@ -455,7 +455,9 @@ protected function withVariations(int $count = 1): int
             throw new InvalidPeriodException();
         }
 
-        $laravelMetrics = (new self($this->builder));
+        $laravelMetrics = (new self(DB::table($this->table)))
+            ->by($this->period, $count)
+            ->aggregate($this->aggregate, str_replace($this->table . '.', '', $this->column));
 
         $result = match ($this->period) {
             Period::DAY->value => $laravelMetrics