From bccaedf8c19da0de0f66eb54ec379c7ec9572b50 Mon Sep 17 00:00:00 2001 From: Aleksandr Kulikov Date: Sun, 26 Nov 2017 13:54:11 +0400 Subject: [PATCH] Use more strict SQL syntax to fix work with PostgreSQL --- src/app/Http/Controllers/Owner/OwnerTableController.php | 2 +- src/app/Http/Controllers/User/UserTableController.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/Http/Controllers/Owner/OwnerTableController.php b/src/app/Http/Controllers/Owner/OwnerTableController.php index 7781dba8..df1c2d2e 100644 --- a/src/app/Http/Controllers/Owner/OwnerTableController.php +++ b/src/app/Http/Controllers/Owner/OwnerTableController.php @@ -15,6 +15,6 @@ class OwnerTableController extends Controller public function query() { - return Owner::select(\DB::raw('id as dtRowId, name, description, is_active, created_at')); + return Owner::select(\DB::raw('id as "dtRowId", name, description, is_active, created_at')); } } diff --git a/src/app/Http/Controllers/User/UserTableController.php b/src/app/Http/Controllers/User/UserTableController.php index 48ae1206..af294f58 100644 --- a/src/app/Http/Controllers/User/UserTableController.php +++ b/src/app/Http/Controllers/User/UserTableController.php @@ -16,8 +16,8 @@ class UserTableController extends Controller public function query() { return User::select(\DB::raw( - 'users.id as dtRowId, owners.name owner, users.first_name, users.last_name, users.phone, - users.email, roles.name role, users.is_active' + 'users.id as "dtRowId", owners.name as owner, users.first_name, users.last_name, users.phone, + users.email, roles.name as role, users.is_active' ))->join('owners', 'users.owner_id', '=', 'owners.id') ->join('roles', 'users.role_id', '=', 'roles.id'); }