Re-escaping from column with SQL Server support

Signed-off-by: Robert Reinhard <robert.reinhard@bukwild.com>
BKWLD · Jan 23, 2018 · 3cae304 · 3cae304
1 parent 7fe46a9
commit 3cae304
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/classes/Models/RedirectRule.php b/classes/Models/RedirectRule.php
@@ -109,9 +109,10 @@ public function scopeMatchUsingRequest($query)
         return $query->where(function ($query) {
             $from = $this->pathAndQuery();
             $escaped_from = DB::connection()->getPdo()->quote($from);
-            $query->where('from', $from)->orWhereRaw("{$escaped_from} LIKE from");
+            $from_col = DB::getDriverName() == 'sqlsrv' ? '[from]' : '`from`';
+            $query->where('from', $from)->orWhereRaw("{$escaped_from} LIKE {$from_col}");
             if (Config::get('decoy::core.allow_regex_in_redirects')) {
-                $query->orWhereRaw("{$escaped_from} REGEXP from");
+                $query->orWhereRaw("{$escaped_from} REGEXP {$from_col}");
             }
         });
     }