#346 custom reports should allow trailing sql semicolon

2017-09-21 19:53:56 +01:00
parent d572334a73
commit 5ee0206c91
1 changed files with 2 additions and 1 deletions
--- 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} }