From 5ee0206c9121dbd81d3c89f428615e5eff81e63d Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Thu, 21 Sep 2017 19:53:56 +0100 Subject: [PATCH] #346 custom reports should allow trailing sql semicolon --- lib/App/Netdisco/Web/GenericReport.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/App/Netdisco/Web/GenericReport.pm b/lib/App/Netdisco/Web/GenericReport.pm index 84a2cda8..800fa2ef 100644 --- a/lib/App/Netdisco/Web/GenericReport.pm +++ b/lib/App/Netdisco/Web/GenericReport.pm @@ -28,8 +28,9 @@ foreach my $report (@{setting('reports')}) { my $schema = ($report->{database} || 'netdisco'); my $rs = schema($schema)->resultset('Virtual::GenericReport')->result_source; + (my $query = $report->{query}) =~ s/;$//; - $rs->view_definition($report->{query}); + $rs->view_definition($query); $rs->remove_columns($rs->columns); $rs->add_columns( exists $report->{query_columns} ? @{ $report->{query_columns} }