Skip to content

Apply fixes from StyleCI #2962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2018
Merged

Apply fixes from StyleCI #2962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/Repositories/Metric/AbstractMetricRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,14 @@ public function __construct(Repository $config)
/**
* Get the table names prefix.
*
* @return string
* @return string
*/
protected function getPrefix()
{
$driver = $this->config->get('database.default');
$connection = $this->config->get('database.connections.'.$driver);
$prefix = $connection['prefix'];

return $prefix;
}

Expand All @@ -68,17 +69,19 @@ protected function getPrefix()
protected function getTableName()
{
$prefix = $this->getPrefix();

return $prefix.'metrics';
}

/**
* Get the metric points table name.
*
* @return string
* @return string
*/
protected function getMetricPointsTableName()
{
$prefix = $this->getPrefix();

return $prefix.'metric_points';
}
}
1 change: 0 additions & 1 deletion app/Repositories/Metric/MySqlRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public function getPointsLastHour(Metric $metric, $hour, $minute)
$timeInterval = $dateTime->format('YmdHi');
$metricPointsTableName = $this->getMetricPointsTableName();


if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
$queryType = 'SUM(mp.`value` * mp.`counter`) AS `value`';
} elseif ($metric->calc_type == Metric::CALC_AVG) {
Expand Down