Skip to content

Database options extensions #200

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Database options extensions #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2c72fc
Adding the ability to have variable parameters (select) that are pull…
Auz Jul 31, 2015
b5fb2b9
Added the ability to do arbitrary queries when using database_options…
Auz Jul 31, 2015
871b73f
Cleaned up whitespaces.
Auz Jul 31, 2015
171ebf7
Simplified logic around variable mysql options in reports of type php.
Auz Aug 3, 2015
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
35 changes: 23 additions & 12 deletions classes/report_types/MysqlReportType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,22 @@ public static function closeConnection(&$report) {
}

public static function getVariableOptions($params, &$report) {
$query = 'SELECT DISTINCT '.$params['column'].' FROM '.$params['table'];

if(isset($params['where'])) {
$query .= ' WHERE '.$params['where'];
}
if (isset($params['query'])) {
$query = $params['query'];
} else if (isset($params['column']) && isset($params['table'])) {
$query = 'SELECT DISTINCT ' . $params['column'] . ' FROM ' . $params['table'];

if (isset($params['where'])) {
$query .= ' WHERE ' . $params['where'];
}

if(isset($params['order']) && in_array($params['order'], array('ASC', 'DESC')) ) {
$query .= ' ORDER BY '.$params['column'].' '.$params['order'];
if (isset($params['order']) && in_array($params['order'], array('ASC', 'DESC'))) {
$query .= ' ORDER BY ' . $params['column'] . ' ' . $params['order'];
}
}


if(empty($query)) return array();

$result = mysql_query($query, $report->conn);

if(!$result) {
Expand All @@ -105,11 +111,16 @@ public static function getVariableOptions($params, &$report) {
$options = array();

if(isset($params['all'])) $options[] = 'ALL';

while($row = mysql_fetch_assoc($result)) {
$options[] = $row[$params['column']];

if (isset($params['column'])) {
while ($row = mysql_fetch_assoc($result)) {
$options[] = $row[$params['column']];
}
} else {
while ($row = mysql_fetch_array($result)) {
$options[] = $row[0];
}
}

return $options;
}

Expand Down
28 changes: 27 additions & 1 deletion classes/report_types/PhpReportType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,33 @@ public static function openConnection(&$report) {
public static function closeConnection(&$report) {

}


public static function getVariableOptions($params, &$report)
{

if (is_array($params)) {

// support for dynamic select type using database_options in php reports
// only supporting mysql currently:

if (stristr($params['type'], 'mysql')) {

// create a clone of our report for a mysql connection to not pollute
// the original object. This may not be necessary.
$reportMysql = clone $report;

// Connect to the database since this we are using a different type.
// This also allows for setting the database with the varaible string.
$reportMysql->options['Database'] = isset($params['database']) ? $params['database'] : 'mysql';
MysqlReportType::openConnection($reportMysql);

return MysqlReportType::getVariableOptions($params, $reportMysql);
}
}

return array();
}

public static function run(&$report) {
$eval = "<?php /*BEGIN REPORT MACROS*/ ?><?php ";
foreach($report->macros as $key=>$value) {
Expand Down