--- lib/A3C/Action/StrixSQL.pm 2008/06/15 17:47:39 162 +++ lib/A3C/Action/StrixSQL.pm 2008/06/15 23:19:02 167 @@ -10,7 +10,7 @@ package A3C::Action::StrixSQL; use base qw/A3C::Action Jifty::Action/; -use DBI; +use Strix; use Data::Dump qw/dump/; use Jifty::Param::Schema; @@ -48,23 +48,9 @@ return unless ( $self->result->success ); - my $config = Jifty->config->app('strix') or die "need strix config"; - my $database = $config->{database} or die "no strix.database in config"; - - Jifty->log->debug("using config ", dump( $database )); - - my $dsn = - 'DBI:Pg:dbname=' . $self->argument_value('strix') . - ';host=' . $database->{host} . - ';port=' . $database->{port}; - - Jifty->log->info("psql ", $self->argument_value('strix'), " [$dsn] ", $self->argument_value('sql')); - - my $dbh = DBI->connect( $dsn, $database->{user}, $database->{passwd} ) or die $DBI::errstr; - my $sql = A3C::SQL->new({ query => $self->argument_value('sql'), - dbh => $dbh, + dbh => Strix->dbh( $self->argument_value('strix') ), encoding => 'iso-8859-2', });