From e6c8dec454d6696c177caec1b999e696a8772a29 Mon Sep 17 00:00:00 2001 From: Alex 'AdUser' Z Date: Wed, 23 Aug 2017 13:21:32 +1000 Subject: [PATCH] * refactor database connection options --- docs/cmtd.conf.sample | 6 +++++- lib/CMTD.pm | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/cmtd.conf.sample b/docs/cmtd.conf.sample index b924b8f..7166f26 100644 --- a/docs/cmtd.conf.sample +++ b/docs/cmtd.conf.sample @@ -1,6 +1,10 @@ { secret => 'cookie-sign-key', - db => ['dbi:SQLite:dbname=data/data.db'], + db => { + dsn => 'dbi:SQLite:dbname=data/data.db', + user => undef, + pass => undef, + }, captcha => { tries => 5, limit => 500, diff --git a/lib/CMTD.pm b/lib/CMTD.pm index d1b9883..dec4aa9 100644 --- a/lib/CMTD.pm +++ b/lib/CMTD.pm @@ -25,9 +25,10 @@ sub startup { return $cap; }); $self->app->attr(db => sub { - my $config = $self->app->config->{db} || []; + my $c = $self->app->config->{db} || {}; require DBIx::Simple; - my $dbh = DBIx::Simple->new(@{ $config }); + my %opts = (AutoCommit => 1, RaiseError => 1, sqlite_see_if_its_a_number => 1); + my $dbh = DBIx::Simple->new($c->{dsn}, $c->{user}, $c->{pass}, \%opts); return $dbh; });