From ce1e7517c5287a916fcbcd4af6295d4f994fe879 Mon Sep 17 00:00:00 2001 From: dmason30 Date: Tue, 21 Feb 2023 22:54:32 +0000 Subject: [PATCH] Fixes #151 Remove expression usage for Laravel 10 compatibility --- src/api/TotalCircleController.php | 2 +- src/api/TotalRecordsController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/TotalCircleController.php b/src/api/TotalCircleController.php index ea61f9c..f38ec2c 100644 --- a/src/api/TotalCircleController.php +++ b/src/api/TotalCircleController.php @@ -30,7 +30,7 @@ public function handle(NovaRequest $request) $model = $request->input('model'); $modelInstance = new $model; $tableName = $modelInstance->getConnection()->getTablePrefix() . $modelInstance->getTable(); - $xAxisColumn = $request->input('col_xaxis') ?? DB::raw($tableName.'.created_at'); + $xAxisColumn = $request->input('col_xaxis') ?? $tableName.'.created_at'; $cacheKey = hash('md4', $model . (int)(bool)$request->input('expires')); $dataSet = Cache::get($cacheKey); if (!$dataSet) { diff --git a/src/api/TotalRecordsController.php b/src/api/TotalRecordsController.php index 428365a..1f7565e 100644 --- a/src/api/TotalRecordsController.php +++ b/src/api/TotalRecordsController.php @@ -39,7 +39,7 @@ public function handle(NovaRequest $request) $modelInstance = new $model; $connectionName = $modelInstance->getConnection()->getDriverName(); $tableName = $modelInstance->getConnection()->getTablePrefix() . $modelInstance->getTable(); - $xAxisColumn = $request->input('col_xaxis') ?? DB::raw($tableName.'.created_at'); + $xAxisColumn = $request->input('col_xaxis') ?? $tableName.'.created_at'; $cacheKey = hash('md4', $model . (int)(bool)$request->input('expires')); $dataSet = Cache::get($cacheKey); if (!$dataSet) {