feat: increase url length to 2048

Author: Boefjim

database/migrations/increase_redirect_error_table_url_length.php.stub

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class IncreaseRedirectErrorTableUrlLength extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('errors', function (Blueprint $table): void {
+            $table->dropIndex('errors_url_index');
+        });
+
+        Schema::table('errors', function (Blueprint $table): void {
+            $table->string('url', 2048)->change();
+            $table->string('url_md5')->index()->after('url');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('errors', function (Blueprint $table): void {
+            $table->dropColumn('url_md5');
+            $table->string('url')->index()->change();
+        });
+    }
+}

database/migrations/increase_redirect_redirects_table_url_length.php.stub

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class IncreaseRedirectRedirectsTableUrlLength extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('redirects', function (Blueprint $table): void {
+            $table->dropIndex('redirects_source_index');
+        });
+
+        Schema::table('redirects', function (Blueprint $table): void {
+            $table->string('source', 2048)->change();
+            $table->string('source_md5')->index()->after('source');
+            $table->string('destination', 2048)->change();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('redirects', function (Blueprint $table): void {
+            $table->dropColumn('source_md5');
+            $table->string('source')->index()->change();
+            $table->string('destination')->change();
+        });
+    }
+}

src/Data/Error.php

@@ -37,6 +37,9 @@ public function getConnectionName()
 
     protected static function booted()
     {
+        self::saving(function ($model) {
+            $model->url_md5 = md5($model->url);
+        });
         self::deleting(function ($error) {
             $error->hits()->delete();
         });
@@ -70,6 +73,6 @@ public function addHit(int $timestamp, array $data = []): ?Hit
 
     public static function findByUrl(string $url): ?self
     {
-        return self::where('url', $url)->first();
+        return self::where('url_md5', md5($url))->where('url', $url)->first();
     }
 }

src/Data/Redirect.php

@@ -29,6 +29,9 @@ class Redirect implements Localization, RedirectContract
     /** @var string */
     protected $source;
 
+    /** @var string */
+    protected $source_md5;
+
     /** @var string */
     protected $destination;
 
@@ -62,6 +65,11 @@ public function source($source = null)
         return $this->fluentlyGetOrSet('source')->args(func_get_args());
     }
 
+    public function source_md5($source_md5 = null)
+    {
+        return $this->fluentlyGetOrSet('source_md5')->args(func_get_args());
+    }
+
     public function destination($destination = null)
     {
         return $this->fluentlyGetOrSet('destination')->args(func_get_args());

src/RedirectServiceProvider.php

@@ -118,11 +118,13 @@ public function boot()
 
         $this->publishes([
             __DIR__ . '/../database/migrations/create_redirect_error_tables.php.stub' => database_path('migrations/' . date('Y_m_d_His', time()) . '_create_redirect_error_tables.php'),
+            __DIR__ . '/../database/migrations/increase_redirect_error_table_url_length.php.stub' => database_path('migrations/' . date('Y_m_d_His', time()) . '_increase_redirect_error_table_url_length.php'),
         ], 'statamic-redirect-error-migrations');
 
         $this->publishes([
             __DIR__ . '/../database/migrations/create_redirect_redirects_table.php.stub' => database_path('migrations/' . date('Y_m_d_His', time()) . '_create_redirect_redirects_table.php'),
             __DIR__ . '/../database/migrations/add_description_to_redirect_redirects_table.php.stub' => database_path('migrations/' . date('Y_m_d_His', time()) . '_add_description_to_redirect_redirects_table.php'),
+            __DIR__ . '/../database/migrations/increase_redirect_redirects_table_url_length.php.stub' => database_path('migrations/' . date('Y_m_d_His', time()) . '_increase_redirect_redirects_table_url_length.php'),
         ], 'statamic-redirect-redirect-migrations');
     }
 
@@ -240,6 +242,8 @@ protected function bootDatabaseForErrors()
         DB::setDefaultConnection('redirect-sqlite');
         require_once(__DIR__ . '/../database/migrations/create_redirect_error_tables.php.stub');
         (new \CreateRedirectErrorTables())->up();
+        require_once(__DIR__ . '/../database/migrations/increase_redirect_error_table_url_length.php.stub');
+        (new \IncreaseRedirectErrorTableUrlLength())->up();
         DB::setDefaultConnection($defaultConnection);
     }
 
@@ -263,6 +267,8 @@ protected function bootDatabaseForRedirects()
         (new \CreateRedirectRedirectsTable())->up();
         require_once(__DIR__ . '/../database/migrations/add_description_to_redirect_redirects_table.php.stub');
         (new \AddDescriptionToRedirectRedirectsTable())->up();
+        require_once(__DIR__ . '/../database/migrations/increase_redirect_redirects_table_url_length.php.stub');
+        (new \IncreaseRedirectRedirectsTableUrlLength())->up();
 
         DB::setDefaultConnection($defaultConnection);
     }

src/Stache/Redirects/RedirectRepository.php

@@ -42,10 +42,25 @@ public function findByUrl(string $siteHandle, string $url): ?Redirect
             ->where('locale', $siteHandle)
             ->where(function (RedirectQueryBuilder $query) use ($url) {
                 $query
-                    ->orWhere('source', $url)
-                    ->orWhere('source', str($url)->start('/'))
-                    ->orWhere('source', str($url)->finish('/'))
-                    ->orWhere('source', str($url)->start('/')->finish('/'));
+                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
+                        $query->where('source_md5', md5($url))
+                            ->where('source', $url);
+                    })
+                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
+                        $source = str($url)->start('/');
+                        $query->where('source_md5', md5($source))
+                            ->where('source', $source);
+                    })
+                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
+                        $source = str($url)->finish('/');
+                        $query->where('source_md5', md5($source))
+                            ->where('source', $source);
+                    })
+                    ->orWhere(function (RedirectQueryBuilder $query) use ($url) {
+                        $source = str($url)->start('/')->finish('/');
+                        $query->where('source_md5', md5($source))
+                            ->where('source', $source);
+                    });
             })
             ->where('matchType', MatchTypeEnum::EXACT)
             ->orderBy('order')
@@ -86,6 +101,7 @@ public function save($redirect)
         if (! $redirect->id()) {
             $redirect->id(StacheFacade::generateId());
         }
+        $redirect->source_md5(md5($redirect->source()));
 
         StacheFacade::store('redirects')->save($redirect);
 

tests/TestCase.php

@@ -94,6 +94,9 @@ protected function defineDatabaseMigrations(): void
 
         include_once __DIR__ . '/../database/migrations/create_redirect_error_tables.php.stub';
         (new \CreateRedirectErrorTables())->up();
+
+        include_once __DIR__ . '/../database/migrations/increase_redirect_error_table_url_length.php.stub';
+        (new \IncreaseRedirectErrorTableUrlLength())->up();
     }
 
     /**