From 3cae3047c5301e1904f29b161a5cad35d2750170 Mon Sep 17 00:00:00 2001 From: Robert Reinhard Date: Mon, 22 Jan 2018 19:02:44 -0800 Subject: [PATCH] Re-escaping `from` column with SQL Server support Signed-off-by: Robert Reinhard --- classes/Models/RedirectRule.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/Models/RedirectRule.php b/classes/Models/RedirectRule.php index a7c77310..500b4c92 100644 --- 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}"); } }); }