|
@@ -6,6 +6,7 @@ use Illuminate\Database\Capsule\Manager as Capsule;
|
6
|
6
|
use Illuminate\Database\Connection;
|
7
|
7
|
use Illuminate\Database\Query\Builder;
|
8
|
8
|
use Luticate\Utils\Business\LuArrayUtils;
|
|
9
|
+use Luticate\Utils\Business\LuStringUtils;
|
9
|
10
|
use Luticate\Utils\Dbo\LuDbo;
|
10
|
11
|
|
11
|
12
|
abstract class LuDataAccess {
|
|
@@ -89,8 +90,10 @@ abstract class LuDataAccess {
|
89
|
90
|
{
|
90
|
91
|
$query = static::resolveQuery($query);
|
91
|
92
|
$string = $query->aggregate("json_agg", [static::$_table_as]);
|
92
|
|
- $json = json_decode($string, true);
|
93
|
|
- $data = LuArrayUtils::snakeToCamelCase($json);
|
|
93
|
+ if (is_null($string)) {
|
|
94
|
+ return [];
|
|
95
|
+ }
|
|
96
|
+ $data = LuStringUtils::convertJsonString($string);
|
94
|
97
|
|
95
|
98
|
return call_user_func([static::$_dboArrayClass, 'jsonDeserialize'], $data);
|
96
|
99
|
}
|