Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index eba336f..3cdb9a4 100644 (file)
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -243,6 +243,7 @@ sub process_perl_script {
   $dbh->begin_work;
 
   # setup dbup_ export vars & run script
+  my $old_dbh       = $::form->set_standard_dbh($dbh);
   my %dbup_myconfig = map { ($_ => $::form->{$_}) } qw(dbname dbuser dbpasswd dbhost dbport dbconnect);
   my $result        = eval {
     SL::DBUpgrade2::Base::execute_script(
@@ -255,6 +256,8 @@ sub process_perl_script {
 
   my $error = $EVAL_ERROR;
 
+  $::form->set_standard_dbh($old_dbh);
+
   $dbh->rollback if 1 != ($result // -1);
 
   return $error if $self->{return_on_error} && (1 != ($result // -1));

diff --git a/SL/Form.pm b/SL/Form.pm
index 79ff703..b18bc67 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1403,6 +1403,14 @@ sub get_standard_dbh {
   return $standard_dbh;
 }
 
+sub set_standard_dbh {
+  my ($self, $dbh) = @_;
+  my $old_dbh      = $standard_dbh;
+  $standard_dbh    = $dbh;
+
+  return $old_dbh;
+}
+
 sub date_closed {
   $main::lxdebug->enter_sub();
 

diff --git a/SL/InstanceConfiguration.pm b/SL/InstanceConfiguration.pm
index 716edee..13c4d1c 100644 (file)
--- a/SL/InstanceConfiguration.pm
+++ b/SL/InstanceConfiguration.pm
@@ -7,28 +7,38 @@ use SL::DBUtils ();
 
 use parent qw(Rose::Object);
 use Rose::Object::MakeMethods::Generic (
-  'scalar --get_set_init' => [ qw(data currencies) ],
+  'scalar --get_set_init' => [ qw(data currencies default_currency _table_currencies_exists) ],
 );
 
 sub init_data {
   return {} if !$::auth->client;
+  return SL::DBUtils::selectfirst_hashref_query($::form, $::form->get_standard_dbh, qq|SELECT * FROM defaults|);
+}
 
-  my $dbh                   = $::form->get_standard_dbh;
-  my $data                  = SL::DBUtils::selectfirst_hashref_query($::form, $dbh, qq|SELECT * FROM defaults|);
-  $data->{default_currency} = (SL::DBUtils::selectfirst_array_query($::form, $dbh, qq|SELECT name FROM currencies WHERE id = ?|, $data->{currency_id}))[0] if $data->{currency_id};
-
-  return $data;
+sub init__table_currencies_exists {
+  return 0 if !$::auth->client;
+  return !!(SL::DBUtils::selectall_hashref_query($::form, $::form->get_standard_dbh, qq|SELECT tablename FROM pg_tables WHERE (schemaname = 'public') AND (tablename = 'currencies')|))[0];
 }
 
 sub init_currencies {
-  return [] if !$::auth->client;
+  my ($self) = @_;
+
+  return [] if !$self->_table_currencies_exists;
   return [ map { $_->{name} } SL::DBUtils::selectall_hashref_query($::form, $::form->get_standard_dbh, qq|SELECT name FROM currencies ORDER BY id ASC|) ];
 }
 
+sub init_default_currency {
+  my ($self) = @_;
+
+  return undef if !$self->_table_currencies_exists || !$self->data->{currency_id};
+  return (SL::DBUtils::selectfirst_array_query($::form, $::form->get_standard_dbh, qq|SELECT name FROM currencies WHERE id = ?|, $self->data->{currency_id}))[0];
+}
+
 sub reload {
-  my ($self)          = @_;
-  $self->{data}       = $self->init_data;
-  $self->{currencies} = $self->init_currencies;
+  my ($self) = @_;
+
+  delete @{ $self }{qw(data currencies default_currency)};
+
   return $self;
 }
 

diff --git a/SL/User.pm b/SL/User.pm
index 3e9d0ac..a267fcd 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -150,7 +150,6 @@ sub login {
   $SIG{QUIT} = 'IGNORE';
 
   $self->dbupdate2(form => $form, updater => $dbupdater, database => $::auth->client->{dbname});
-  SL::DBUpgrade2->new(form => $::form, auth => 1)->apply_admin_dbupgrade_scripts(0);
 
   SL::System::InstallationLock->unlock;