Fix DB prefixing for Postgres and SQLite (#386)

Author: jessarcher

src/Storage/DatabaseStorage.php

@@ -179,7 +179,9 @@ protected function upsertCount(array $values): int
             [
                 'value' => match ($driver = $this->connection()->getDriverName()) {
                     'mariadb', 'mysql' => new Expression('`value` + values(`value`)'),
-                    'pgsql', 'sqlite' => new Expression('"pulse_aggregates"."value" + "excluded"."value"'),
+                    'pgsql', 'sqlite' => new Expression(<<<SQL
+                        {$this->wrap('pulse_aggregates.value')} + "excluded"."value"
+                        SQL),
                     default => throw new RuntimeException("Unsupported database driver [{$driver}]"),
                 },
             ]
@@ -199,8 +201,12 @@ protected function upsertMin(array $values): int
             [
                 'value' => match ($driver = $this->connection()->getDriverName()) {
                     'mariadb', 'mysql' => new Expression('least(`value`, values(`value`))'),
-                    'pgsql' => new Expression('least("pulse_aggregates"."value", "excluded"."value")'),
-                    'sqlite' => new Expression('min("pulse_aggregates"."value", "excluded"."value")'),
+                    'pgsql' => new Expression(<<<SQL
+                        least({$this->wrap('pulse_aggregates.value')}, "excluded"."value")
+                        SQL),
+                    'sqlite' => new Expression(<<<SQL
+                        min({$this->wrap('pulse_aggregates.value')}, "excluded"."value")
+                        SQL),
                     default => throw new RuntimeException("Unsupported database driver [{$driver}]"),
                 },
             ]
@@ -220,8 +226,12 @@ protected function upsertMax(array $values): int
             [
                 'value' => match ($driver = $this->connection()->getDriverName()) {
                     'mariadb', 'mysql' => new Expression('greatest(`value`, values(`value`))'),
-                    'pgsql' => new Expression('greatest("pulse_aggregates"."value", "excluded"."value")'),
-                    'sqlite' => new Expression('max("pulse_aggregates"."value", "excluded"."value")'),
+                    'pgsql' => new Expression(<<<SQL
+                        greatest({$this->wrap('pulse_aggregates.value')}, "excluded"."value")
+                        SQL),
+                    'sqlite' => new Expression(<<<SQL
+                        max({$this->wrap('pulse_aggregates.value')}, "excluded"."value")
+                        SQL),
                     default => throw new RuntimeException("Unsupported database driver [{$driver}]"),
                 },
             ]
@@ -241,7 +251,9 @@ protected function upsertSum(array $values): int
             [
                 'value' => match ($driver = $this->connection()->getDriverName()) {
                     'mariadb', 'mysql' => new Expression('`value` + values(`value`)'),
-                    'pgsql', 'sqlite' => new Expression('"pulse_aggregates"."value" + "excluded"."value"'),
+                    'pgsql', 'sqlite' => new Expression(<<<SQL
+                        {$this->wrap('pulse_aggregates.value')} + "excluded"."value"
+                        SQL),
                     default => throw new RuntimeException("Unsupported database driver [{$driver}]"),
                 },
             ]
@@ -264,8 +276,12 @@ protected function upsertAvg(array $values): int
                     'count' => new Expression('`count` + values(`count`)'),
                 ],
                 'pgsql', 'sqlite' => [
-                    'value' => new Expression('("pulse_aggregates"."value" * "pulse_aggregates"."count" + ("excluded"."value" * "excluded"."count")) / ("pulse_aggregates"."count" + "excluded"."count")'),
-                    'count' => new Expression('"pulse_aggregates"."count" + "excluded"."count"'),
+                    'value' => new Expression(<<<SQL
+                        ({$this->wrap('pulse_aggregates.value')} * {$this->wrap('pulse_aggregates.count')} + ("excluded"."value" * "excluded"."count")) / ({$this->wrap('pulse_aggregates.count')} + "excluded"."count")
+                        SQL),
+                    'count' => new Expression(<<<SQL
+                        {$this->wrap('pulse_aggregates.count')} + "excluded"."count"
+                        SQL),
                 ],
                 default => throw new RuntimeException("Unsupported database driver [{$driver}]"),
             }

tests/Feature/Recorders/SlowQueriesTest.php

@@ -14,7 +14,7 @@
         $event->time = 5000;
     });
 
-    DB::connection()->statement('select * from users');
+    DB::connection()->statement($sql = 'select * from '.DB::getTablePrefix().'users');
 
     Pulse::ingest();
 
@@ -26,7 +26,7 @@
         'value' => 5000,
     ]);
     $key = json_decode($entries[0]->key);
-    expect($key[0])->toBe('select * from users');
+    expect($key[0])->toBe($sql);
     expect($key[1])->not->toBeNull();
     $aggregates = Pulse::ignore(fn () => DB::table('pulse_aggregates')->orderBy('period')->orderBy('aggregate')->get());
     expect($aggregates)->toHaveCount(8);
@@ -38,7 +38,7 @@
         'value' => 1,
     ]);
     $key = json_decode($aggregates[0]->key);
-    expect($key[0])->toBe('select * from users');
+    expect($key[0])->toBe($sql);
     expect($key[1])->not->toBeNull();
     expect($aggregates[1])->toHaveProperties([
         'bucket' => (int) (floor((now()->timestamp - 5) / 60) * 60),
@@ -48,7 +48,7 @@
         'value' => 5000,
     ]);
     $key = json_decode($aggregates[1]->key);
-    expect($key[0])->toBe('select * from users');
+    expect($key[0])->toBe($sql);
     expect($key[1])->not->toBeNull();
 });
 
@@ -59,7 +59,8 @@
         $event->time = 5000;
     });
 
-    DB::connection()->statement('select * from users');
+    DB::connection()->statement($sql = 'select * from '.DB::getTablePrefix().'users');
+
     Pulse::ingest();
 
     $entries = Pulse::ignore(fn () => DB::table('pulse_entries')->get());
@@ -70,7 +71,7 @@
         'value' => 5000,
     ]);
     $key = json_decode($entries[0]->key);
-    expect($key[0])->toBe('select * from users');
+    expect($key[0])->toBe($sql);
     expect($key[1])->toBeNull();
     $aggregates = Pulse::ignore(fn () => DB::table('pulse_aggregates')->orderBy('period')->orderBy('aggregate')->get());
     expect($aggregates)->toHaveCount(8);
@@ -82,7 +83,7 @@
         'value' => 1,
     ]);
     $key = json_decode($aggregates[0]->key);
-    expect($key[0])->toBe('select * from users');
+    expect($key[0])->toBe($sql);
     expect($key[1])->toBeNull();
     expect($aggregates[1])->toHaveProperties([
         'bucket' => (int) (floor((now()->timestamp - 5) / 60) * 60),
@@ -92,7 +93,7 @@
         'value' => 5000,
     ]);
     $key = json_decode($aggregates[1]->key);
-    expect($key[0])->toBe('select * from users');
+    expect($key[0])->toBe($sql);
     expect($key[1])->toBeNull();
 });
 
@@ -130,7 +131,7 @@
     expect($entries[0]->key)->toContain('one_second_threshold');
     expect($entries[0]->value)->toBe(1_000);
 
-    DB::table('pulse_entries')->delete();
+    Pulse::ignore(fn () => DB::table('pulse_entries')->delete());
 
     $queryDuration = 2_000;
     DB::pretend(function () {