Skip to content

Commit 87df968

Browse files
authored
Merge pull request #34 from nnnms/master
Use more strict SQL syntax to ensure PostgreSQL compatibility
2 parents 5d447c5 + bccaedf commit 87df968

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/app/Http/Controllers/Owner/OwnerTableController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ class OwnerTableController extends Controller
1515

1616
public function query()
1717
{
18-
return Owner::select(\DB::raw('id as dtRowId, name, description, is_active, created_at'));
18+
return Owner::select(\DB::raw('id as "dtRowId", name, description, is_active, created_at'));
1919
}
2020
}

src/app/Http/Controllers/User/UserTableController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class UserTableController extends Controller
1616
public function query()
1717
{
1818
return User::select(\DB::raw(
19-
'users.id as dtRowId, owners.name owner, users.first_name, users.last_name, users.phone,
20-
users.email, roles.name role, users.is_active'
19+
'users.id as "dtRowId", owners.name as owner, users.first_name, users.last_name, users.phone,
20+
users.email, roles.name as role, users.is_active'
2121
))->join('owners', 'users.owner_id', '=', 'owners.id')
2222
->join('roles', 'users.role_id', '=', 'roles.id');
2323
}

0 commit comments

Comments
 (0)