--- index.cgi 2009/04/13 21:26:43 4 +++ index.cgi 2009/12/08 20:08:29 32 @@ -9,101 +9,121 @@ use Data::Dump qw/dump/; use Time::HiRes qw/time/; +print qq{Content-type: text/html\r\n\r\n}; + our $dsn = 'DBI:Pg:dbname=syslog'; +our $database = ''; # if not in $dsn our $user = 'dpavlin'; +our $table = 'log'; +our $limit = 1000; +our $passwd = ''; + +our $group_by_join = { + feed_id => [ 'feeds', 'id', 'title', 'link', 'timestamp' ], +}; require 'config.pl' if -e 'config.pl'; +$table = param('table') || $table; my @columns = param('columns'); @columns = ('*') unless @columns; -my $table = param('table') || 'log'; -my $limit = param('limit') || 1000; +$limit = param('limit') || $limit; my $offset = param('offset') || 0; my @where_parts = param('where_parts'); -print header, q| - - - -SQL Web Session - - - - - - -|; + my $join = ''; + my @join = @{ $group_by_join->{$group_by} } if defined $group_by_join->{$group_by}; + if ( @join ) { + warn "## join ",dump( @join ); + my $join_table = shift @join; + my $col = shift @join; + $join = qq{ join $join_table on $table.$group_by = $join_table.$col }; + my @join_cols = map { $join_table . '.' . $_ } @join; + push @cols, @join_cols; + push @group_by, @join_cols; + } -my $dbh = DBI->connect( $dsn, $user, '', { RaiseError => 1 } ) || die $DBI::errstr; + my @data = where_from_parts( @where_parts ); + my $sql = join("\n", + 'select', join(',', @cols), qq{ + from $table + $join + }, shift @data, # extract where + 'group by', join(',', @group_by), qq{ + order by count($group_by) desc + limit $limit + } + ); -my $group_by = param('add_group_by'); + warn "# join SQL: $sql\n"; -if ( $group_by ) { - @columns = ( "count($group_by)", $group_by ); - my $g; - foreach my $c ( @where_parts, param('order_by'), $group_by ) { - $c =~ s/\s.+$//; - $g->{$c}++ if length($c) > 0; + my $t = time(); + my $sth = $dbh->prepare( $sql ); + $sth->execute( @data ); + $t = time() - $t; + print qq||, sql_html( $sql, @data ), qq||; + print qq||; + while ( my @row = $sth->fetchrow_array ) { + my $n = shift @row; + $n = 'NULL' unless defined $n; + print qq||; } - $group_by = join( ',', keys %$g ); - print "# $group_by g = ",dump( $g ); - param('where_value',''); - param('group_by', $group_by); - param('columns', [ @columns ], [ @columns ]); - param('order_by', $columns[0] . ' desc'); -} else { - $group_by = param('group_by'); + print qq|
|, join(qq||, @cols), qq|
$n|, join(qq||, @row), qq|
|; + print $sth->rows, qq| rows in $t s|; + exit; } - + +print q| + + + + +SQL Web Session + + + + + + + + +|; + +my $group_by = param('group_by'); if ( param('where_operator') && length( param('where_value') ) > 0 ) { my $where_value = param('where_value'); @@ -117,16 +137,9 @@ 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); -} - +my @where = where_from_parts( @where_parts ); +$sql .= shift @where; +push @data, @where; $sql .= ' group by ' . $group_by if $group_by; $sql .= ' order by ' . param('order_by') if param('order_by'); @@ -134,12 +147,7 @@ push @data, ( $limit, $offset ); -my $sql_html = $sql; -{ - my @d = @data; - $sql_html =~ s{\?}{dump( shift @d )}ge; -} -print qq|$sql_html
\n\r\n\r|; +print qq||, sql_html( $sql, @data ), qq|
\n|; my $t = time(); @@ -151,54 +159,41 @@ print $sth->rows, qq| rows in $t s|; - @columns = @{ $sth->{NAME} } if $#columns == 0 && $columns[0] eq '*'; -print qq||; - -my $counter = 0; -sub table_row { - my $cell = shift; - my $class = $counter++ % 2 == 0 ? ' class=o' : ''; - return - qq|<$cell>| - . join( qq|<$cell>|, @_ ) - . qq|| - ; - -} - -print table_row( 'th', @columns ); - -while ( my @row = $sth->fetchrow_array ) { - print table_row( 'td', @row ); -} - print - qq|
| - , start_form( -id => 'sql' ) + start_form( -id => 'sql', -class => 'fixed' ) + + , qq|| + , qq|| , qq|| , checkbox_group( -name => 'columns', -values => [ @columns ], -defaults => [ @columns ] ) , qq|| - , textfield( -name => 'from', -value => $table, -default => 'log' ) + , textfield( -name => 'from', -value => $table, -default => $table ) , 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 => [ 'not like', 'like', '!=', '=' ]) , textfield( -name => 'where_value' ) + , qq| + + + +
+ + | , qq|| , textfield( -name => 'group_by' ) - , submit( -name => 'add_group_by' ) , qq|| , textfield( -name => 'order_by' ) , qq|| - , textfield( -name=> 'limit', -default => 1000, -size => 4 ) + , textfield( -name=> 'limit', -default => $limit, -size => 4 ) , qq|| , textfield( -name=> 'offset', -default => 0, -size => 4 ) @@ -206,7 +201,36 @@ , submit( -name => 'execute', -value => 'execute' ) , end_form + ; + +#my @types = map { scalar $dbh->type_info($_)->{TYPE_NAME} } @{ $sth->{TYPE} }; +my $types = dump( $sth->{TYPE} ); +print qq{ + +}; + +print qq||; +my $counter = 0; +sub table_row { + my $cell = shift; + my $class = $counter++ % 2 == 0 ? ' class=o' : ''; + return + qq|<$cell>| + . join( qq|<$cell>|, @_ ) + . qq|| + ; + +} + +print table_row( 'th', @columns ); + +while ( my @row = $sth->fetchrow_array ) { + print table_row( 'td', @row ); +} +print qq|
| , qq|| ;