Merge pull request #32 from drsdre/drsdre-patch-fqdn-backslash

Author: timothepearce

src/Models/Projection.php

@@ -87,7 +87,7 @@ public function scopeName(Builder $query, string $projectorName): Builder
     {
         $this->projectionName = $projectorName;
 
-        return $query->where('projection_name', $projectorName);
+        return $query->whereRaw('projection_name = ?', [$projectorName]);
     }
 
     /**

src/Models/Scopes/ProjectionScope.php

@@ -15,7 +15,7 @@ class ProjectionScope implements Scope
     public function apply(Builder $builder, Model $model): void
     {
         if (! $this->isAbstractProjection($model)) {
-            $builder->where('projection_name', $model::class);
+            $builder->whereRaw('projection_name = ?', [$model::class]);
         }
     }
 

src/Models/Traits/Projectable.php

@@ -52,7 +52,7 @@ public function projections(
         $query = $this->morphToMany(Projection::class, 'projectable', 'time_series_projectables');
 
         if (isset($projectionName)) {
-            $query->where('projection_name', $projectionName);
+            $query->whereRaw('projection_name = ?', [$projectionName]);
         }
 
         if (isset($periods) && is_string($periods)) {

src/Projector.php

@@ -93,25 +93,28 @@ private function parsePeriod(string $period): void
      */
     private function findGlobalProjection(): Projection|null
     {
-        return Projection::firstWhere([
-            ['projection_name', $this->projectionName],
-            ['key', $this->hasKey() ? $this->key() : null],
-            ['period', '*'],
-            ['start_date', null],
-        ]);
+        return Projection::whereRaw('projection_name = ?', [$this->projectionName])
+             ->where([
+                 ['key', $this->hasKey() ? $this->key() : null],
+                 ['period', '*'],
+                 ['start_date', null],
+             ])
+             ->first();
     }
 
     /**
      * Finds the projection if it exists.
      */
     private function findProjection(string $period): Projection|null
     {
-        return Projection::firstWhere([
-            ['projection_name', $this->projectionName],
-            ['key', $this->hasKey() ? $this->key() : null],
-            ['period', $period],
-            ['start_date', app(TimeSeries::class)->resolveFloorDate($this->projectedModel->{$this->dateColumn}, $period)],
-        ]);
+        return Projection::whereRaw('projection_name = ?', [$this->projectionName])
+             ->where([
+                 ['key', $this->hasKey() ? $this->key() : null],
+                 ['period', $period],
+                 ['start_date', app(TimeSeries::class)->resolveFloorDate($this->projectedModel->{$this->dateColumn}, $period),
+                 ],
+             ])
+             ->first();
     }
 
     /**

tests/Collections/ProjectionCollectionTest.php

@@ -223,7 +223,7 @@ function (Projection $lastProjection) {
     /** @test */
     public function it_is_formatted_to_a_time_series()
     {
-        Log::factory()->create(['created_at' => today()]);
+        Log::factory()->create(['created_at' => today(), 'updated_at' => today()]);
 
         /** @var ProjectionCollection $collection */
         $collection = Projection::all();