From cf739273d59fe0b16fcbfe2d47fb70209613a4b8 Mon Sep 17 00:00:00 2001
From: Joe Nahmias <joe@nahmias.net>
Date: Tue, 23 Aug 2022 21:14:06 -0400
Subject: [PATCH] fix(mssql): do not needlessly qualify columns in
 ColumnRestrictionModel

this allows the ORM to properly escape the rule column, as needed on MSSQL
---
 app/Model/ColumnRestrictionModel.php | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/Model/ColumnRestrictionModel.php b/app/Model/ColumnRestrictionModel.php
index 6c770a831..d9625ed8d 100644
--- a/app/Model/ColumnRestrictionModel.php
+++ b/app/Model/ColumnRestrictionModel.php
@@ -46,11 +46,11 @@ class ColumnRestrictionModel extends Base
         return $this->db
             ->table(self::TABLE)
             ->columns(
-                self::TABLE.'.restriction_id',
-                self::TABLE.'.project_id',
-                self::TABLE.'.role_id',
-                self::TABLE.'.column_id',
-                self::TABLE.'.rule',
+                'restriction_id',
+                'project_id',
+                'role_id',
+                'column_id',
+                'rule',
                 'pr.role',
                 'c.title as column_title'
             )
@@ -73,11 +73,11 @@ class ColumnRestrictionModel extends Base
         $restrictions = $this->db
             ->table(self::TABLE)
             ->columns(
-                self::TABLE.'.restriction_id',
-                self::TABLE.'.project_id',
-                self::TABLE.'.role_id',
-                self::TABLE.'.column_id',
-                self::TABLE.'.rule',
+                'restriction_id',
+                'project_id',
+                'role_id',
+                'column_id',
+                'rule',
                 'pr.role',
                 'c.title as column_title'
             )
@@ -105,11 +105,11 @@ class ColumnRestrictionModel extends Base
         return $this->db
             ->table(self::TABLE)
             ->columns(
-                self::TABLE.'.restriction_id',
-                self::TABLE.'.project_id',
-                self::TABLE.'.role_id',
-                self::TABLE.'.column_id',
-                self::TABLE.'.rule',
+                'restriction_id',
+                'project_id',
+                'role_id',
+                'column_id',
+                'rule',
                 'pr.role'
             )
             ->eq(self::TABLE.'.project_id', $project_id)