# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#=====================================================================
#
# user related functions
use IO::File;
use Fcntl qw(:seek);
+use SL::DB;
#use SL::Auth;
use SL::DB::AuthClient;
use SL::DB::Employee;
return LOGIN_AUTH_DBUPDATE_AVAILABLE() if $dbupdater_auth->unapplied_upgrade_scripts($::auth->dbconnect);
# check if database is down
- my $dbh = $form->dbconnect_noauto;
+ my $dbh = SL::DB->client->dbh;
# we got a connection, check the version
my ($dbversion) = $dbh->selectrow_array(qq|SELECT version FROM defaults|);
my $dbupdater = SL::DBUpgrade2->new(form => $form)->parse_dbupdate_controls;
my @unapplied_scripts = $dbupdater->unapplied_upgrade_scripts($dbh);
- $dbh->disconnect;
+# $dbh->disconnect;
if (!@unapplied_scripts) {
SL::DB::Manager::Employee->update_entries_for_authorized_users;
&dbconnect_vars($form, $db);
- # Flush potentially held database locks.
-# $form->get_standard_dbh->commit;
-
my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror;
$dbh->do($form->{dboptions}) if ($form->{dboptions});
my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh);
+ $::lxdebug->log_time("DB upgrades commencing");
+
foreach my $control (@upgradescripts) {
# Apply upgrade. Control will only return to us if the upgrade has
# been applied correctly and if the update has not requested user
$dbupdater->process_file($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
}
+ $::lxdebug->log_time("DB upgrades finished");
+
$dbh->disconnect;
}