--- index.cgi 2009/04/13 14:26:46 1
+++ index.cgi 2009/04/13 17:55:51 2
@@ -7,22 +7,26 @@
use CGI::Carp qw/fatalsToBrowser/; # FIXME remove for production
use DBI;
use Data::Dump qw/dump/;
+use Time::HiRes qw/time/;
our $dsn = 'DBI:Pg:dbname=syslog';
our $user = 'dpavlin';
+require 'config.pl' if -e 'config.pl';
+
my @columns = param('columns');
@columns = ('*') unless @columns;
my $table = param('table') || 'log';
-my $order_by = param('order_by') || 'timestamp desc';
my $limit = param('limit') || 1000;
my $offset = param('offset') || 0;
+my @where_parts = param('where_parts');
+
print header, q|
-SQL Session
+SQL Web Session
@@ -51,6 +55,7 @@
if ( tag == 'TH' ) {
console.info('header', column);
+ $('form#sql input[name=order_by]').attr('value', where_value);
} else if ( tag = 'TD' ) {
console.info('column', column, where_operator, where_value);
$('form#sql input[name=where_value]').attr('value', where_value);
@@ -59,10 +64,15 @@
console.error('unknown click on ', tag, e);
}
+ $('form#sql').addClass('visible');
};
$('table#results').bind('mouseup', click_on_cell);
+ $('#status').bind('click', function() {
+ $('form#sql').toggleClass('visible');
+ });
+
console.info('ready');
});
@@ -73,22 +83,47 @@
my $dbh = DBI->connect( $dsn, $user, '', { RaiseError => 1 } ) || die $DBI::errstr;
-my @data = ( $limit, $offset );
-my $c = join(',', @columns);
-my $sql = "select $c from $table ";
if ( param('where_operator') && length( param('where_value') ) > 0 ) {
- $sql .= " where " . param('where_column') . ' ' . param('where_operator') . ' ?';
- unshift @data, param('where_value');
+ my $where_value = param('where_value');
+ push @where_parts, param('where_column') . ' ' . param('where_operator') . " ?\t$where_value";
+ param('where_value','');
}
-$sql .= " limit ? offset ?";
-print qq|$sql
|, dump( @data ), qq||;
+my $c = join(',', @columns);
+
+my $sql = "select $c from $table";
+my @data;
+
+if ( @where_parts ) {
+ my @w;
+ foreach ( @where_parts ) {
+ my ( $w,$v ) = split(/\?\t/,$_,2);
+ push @w, "$w ?";
+ push @data, $v;
+ }
+ $sql .= ' where ' . join(' and ', @w);
+}
+
+$sql .= ' order by ' . param('order_by') if param('order_by');
+$sql .= ' limit ? offset ?';
+
+push @data, ( $limit, $offset );
+
+my $t = time();
my $sth = $dbh->prepare( $sql );
$sth->execute( @data );
+$t = time() - $t;
+
+my $sql_html = $sql;
+$sql_html =~ s{\?}{dump( shift @data )}ge;
+
+print qq|$sql_html
|, $sth->rows, qq| rows in $t s|;
+
+
@columns = @{ $sth->{NAME} };
print qq||;
@@ -116,18 +151,19 @@
, start_form( -id => 'sql' )
, qq||
- , checkbox_group( -name => 'columns', -values => [ @columns ], -default => [ @columns ] )
+ , checkbox_group( -name => 'columns', -values => [ @columns ], -defaults => [ @columns ] )
, qq||
, textfield( -name => 'from', -value => $table, -default => 'log' )
, qq||
+ , checkbox_group( -name => 'where_parts', -values => [ @where_parts ], -defaults => [ @where_parts ] )
, popup_menu( -name => 'where_column', -values => [ @columns ] ),
- , popup_menu( -name => 'where_operator', -values => [ 'like', 'not like', '=', '!=' ])
+ , popup_menu( -name => 'where_operator', -values => [ 'not like', 'like', '!=', '=' ])
, textfield( -name => 'where_value' )
, qq||
- , textfield( -name => 'order_by' -value => $order_by )
+ , textfield( -name => 'order_by' )
, qq||
, textfield( -name=> 'limit', -default => 1000, -size => 4 )