diff options
| -rw-r--r-- | Changelog | 1 | ||||
| -rwxr-xr-x | LedgerSMB/User.pm | 28 |
2 files changed, 17 insertions, 12 deletions
@@ -10,6 +10,7 @@ Database * Protection against duplicate transaction id's. * Added foreign key constraint to acc_trans.chart_id * Database backups now use pg_dump +* Database creation routines now attempt to add plpgsql to the db if not there. Security * One is required to change the admin password when it is blank (on first login etc). diff --git a/LedgerSMB/User.pm b/LedgerSMB/User.pm index b4cfca78..8a2e362d 100755 --- a/LedgerSMB/User.pm +++ b/LedgerSMB/User.pm @@ -308,15 +308,17 @@ sub dbcreate { &dbconnect_vars($form, $form->{dbdefault}); # The below line connects to Template1 or another template file in order # to create the db. One must disconnect and reconnect later. - my $superdbh = DBI->connect( - $form->{dbconnect}, + if ($form->{dbsuperuser}){ + my $superdbh = DBI->connect( + $form->{dbconnect}, $form->{dbsuperuser}, $form->{dbsuperpasswd} - ) or $form->dberror; - my $query = qq|$dbcreate{$form->{dbdriver}}|; - $superdbh->do($query) || $form->dberror($query); + ) or $form->dberror; + my $query = qq|$dbcreate{$form->{dbdriver}}|; + $superdbh->do($query) || $form->dberror($query); - $superdbh->disconnect; + $superdbh->disconnect; + } #Reassign for the work below &dbconnect_vars($form, $form->{db}); @@ -326,19 +328,21 @@ sub dbcreate { $form->{dbuser}, $form->{dbpasswd} ) or $form->dberror; - my $superdbh = DBI->connect( + if ($form->{dbsuperuser}){ + my $superdbh = DBI->connect( $form->{dbconnect}, $form->{dbsuperuser}, $form->{dbsuperpasswd} - ) or $form->dberror; + ) or $form->dberror; # JD: We need to check for plpgsql, if it isn't there create it, if we can't error # Good chance I will have to do this twice as I get used to the way the code is # structured - my %langcreate = ( 'Pg' => qq|CREATE LANGUAGE plpgsql|); - my $query = qq|$langcreate{$form->{dbdriver}}|; - $superdbh->do($query); - + my %langcreate = ( 'Pg' => qq|CREATE LANGUAGE plpgsql|); + my $query = qq|$langcreate{$form->{dbdriver}}|; + $superdbh->do($query); + $superdbh->disconnect; + } # create the tables my $dbdriver = ($form->{dbdriver} =~ /Pg/) ? 'Pg' : $form->{dbdriver}; |