From 10384326b57e909bef54feaec97eee18565b163e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 12 Mar 2020 18:03:50 +0100 Subject: [PATCH] remove db prefix --- Application/Timerecording/Application.php | 4 ++-- Models/SessionMapper.php | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Application/Timerecording/Application.php b/Application/Timerecording/Application.php index 31cd8a4..58cbede 100644 --- a/Application/Timerecording/Application.php +++ b/Application/Timerecording/Application.php @@ -74,7 +74,7 @@ final class Application /** * Temp config. * - * @var array{db:array{core:array{masters:array{select:array{db:string, host:string, port:int, login:string, password:string, database:string, prefix:string}}}}, log:array{file:array{path:string}}, app:array{path:string, default:string, domains:array}, page:array{root:string, https:bool}, language:string[]} + * @var array{db:array{core:array{masters:array{select:array{db:string, host:string, port:int, login:string, password:string, database:string}}}}, log:array{file:array{path:string}}, app:array{path:string, default:string, domains:array}, page:array{root:string, https:bool}, language:string[]} * @since 1.0.0 */ private array $config; @@ -83,7 +83,7 @@ final class Application * Constructor. * * @param WebApplication $app WebApplication - * @param array{db:array{core:array{masters:array{select:array{db:string, host:string, port:int, login:string, password:string, database:string, prefix:string}}}}, log:array{file:array{path:string}}, app:array{path:string, default:string, domains:array}, page:array{root:string, https:bool}, language:string[]} $config Application config + * @param array{db:array{core:array{masters:array{select:array{db:string, host:string, port:int, login:string, password:string, database:string}}}}, log:array{file:array{path:string}}, app:array{path:string, default:string, domains:array}, page:array{root:string, https:bool}, language:string[]} $config Application config * * @since 1.0.0 */ diff --git a/Models/SessionMapper.php b/Models/SessionMapper.php index 114e9d6..54dff49 100644 --- a/Models/SessionMapper.php +++ b/Models/SessionMapper.php @@ -111,15 +111,13 @@ final class SessionMapper extends DataMapperAbstract public static function getLastSessionsFromAllEmployees(\DateTime $dt = null) : array { $join = new Builder(self::$db); - $join->prefix(self::$db->getPrefix()) - ->select(self::$table . '.hr_timerecording_session_employee') + $join->select(self::$table . '.hr_timerecording_session_employee') ->selectAs('MAX(hr_timerecording_session_start)', 'maxDate') ->from(self::$table) ->groupBy(self::$table . '.hr_timerecording_session_employee'); $query = new Builder(self::$db); - $query->prefix(self::$db->getPrefix()) - ->select('*')->fromAs(self::$table, 't') + $query->select('*')->fromAs(self::$table, 't') ->innerJoin($join, 'tm') ->on('t.hr_timerecording_session_employee', '=', 'tm.hr_timerecording_session_employee') ->andOn('t.hr_timerecording_session_start', '=', 'tm.maxDate');