#!/usr/bin/perl
BEGIN {
- if (! -d "bin" || ! -d "SL") {
- print("This tool must be run from the kivitendo ERP base directory.\n");
- exit(1);
- }
+ use FindBin;
- unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
- push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
+ unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
+ push (@INC, $FindBin::Bin . '/..');
}
-
use strict;
use warnings;
#######
my ($opt_list, $opt_tree, $opt_rtree, $opt_nodeps, $opt_graphviz, $opt_help);
-my ($opt_user, $opt_apply, $opt_applied, $opt_unapplied, $opt_format, $opt_test_utf8);
+my ($opt_user, $opt_client, $opt_apply, $opt_applied, $opt_unapplied, $opt_format, $opt_test_utf8);
my ($opt_dbhost, $opt_dbport, $opt_dbname, $opt_dbuser, $opt_dbpassword, $opt_create, $opt_type);
-my ($opt_description, $opt_encoding, @opt_depends, $opt_auth_db);
+my ($opt_description, @opt_depends, $opt_auth_db);
our (%myconfig, $form, $user, $auth, $locale, $controls, $dbupgrader);
upgrade file your \$EDITOR will be called with it.
--apply=tag Applies the database upgrades \'tag\' and all
upgrades it depends on. If \'--apply\' is used
- then the option \'--user\' must be used as well.
+ then the option \'--user\' and \'--client\' must be
+ used as well. Use \'--apply=ALL\' to apply all.
--applied List the applied database upgrades for the
database that the user given with \'--user\' uses.
--unapplied List the database upgrades that haven\'t been applied
--help Show this help and exit.
General Options:
+ --client=id-or-name The name (or database ID) of the client to use for
+ database connectivity. You must provide both a client
+ and a user.
--user=name The name of the user configuration to use for
- database connectivity.
+ database connectivity. You must provide both a client
+ and a user.
--auth-db Work on the authentication database instead of a
user database.
--dbname=name Database connection options for the UTF-8
Options for --create:
--type \'sql\' or \'pl\'. Defaults to sql.
--description The description field of the generated upgrade.
- --encoding Encoding used for the file. Defaults to \'utf8\'.
- Note: Your editor will not be told to open the file in
- this encoding.
--depends Tags of upgrades which this upgrade depends upon.
Defaults to the latest stable release upgrade.
Multiple values possible.
my $dbupgrader = $params{dbupgrader};
my $type = $params{type} || 'sql';
my $description = $params{description} || '';
- my $encoding = $params{encoding} || 'utf-8';
my @depends = @{ $params{depends} };
+ my $encoding = 'utf-8';
+
if (!@depends) {
my @releases = grep { /^release_/ } keys %$controls;
@depends = ((sort @releases)[-1]);
print $fh "$comment \@tag: $filename\n";
print $fh "$comment \@description: $description\n";
print $fh "$comment \@depends: @depends\n";
- print $fh "$comment \@encoding: $encoding\n";
+
+ if ($type eq 'pl') {
+ print $fh "package SL::DBUpgrade2::$filename;\n";
+ print $fh "\n";
+ print $fh "use strict;\n";
+ print $fh "use utf8;\n" if $encoding =~ /utf.?8/i;
+ print $fh "\n";
+ print $fh "use parent qw(SL::DBUpgrade2::Base);\n";
+ print $fh "\n";
+ print $fh "sub run {\n";
+ print $fh " my (\$self) = \@_;\n";
+ print $fh "\n";
+ print $fh "}\n";
+ print $fh "\n";
+ print $fh "1;\n";
+ }
+
close $fh;
print "File $full_filename created.\n";
my @upgradescripts = map { $controls->{$_}->{applied} = 0; $controls->{$_} } @order;
- my $dbh = $opt_auth_db ? connect_auth()->dbconnect : $form->dbconnect_noauto(\%myconfig);
- $dbh->{AutoCommit} = 0;
+ my $dbh = $opt_auth_db ? connect_auth()->dbconnect : SL::DB->client->dbh;
$dbh->{PrintWarn} = 0;
$dbh->{PrintError} = 0;
exit 0;
}
- my $db_charset = $::lx_office_conf{system}->{dbcharset};
- $db_charset ||= Common::DEFAULT_CHARSET();
-
foreach my $control (@upgradescripts) {
$control->{file} =~ /\.(sql|pl)$/;
my $file_type = $1;
# apply upgrade
print "Applying upgrade $control->{file}\n";
-
- if ($file_type eq "sql") {
- $dbupgrader->process_query($dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control, $db_charset);
- } else {
- $dbupgrader->process_perl_script($dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control, $db_charset);
- }
+ $dbupgrader->process_file($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
}
$dbh->disconnect unless $opt_auth_db;
sub dump_applied {
my @results;
- my $dbh = $opt_auth_db ? connect_auth()->dbconnect : $form->dbconnect_noauto(\%myconfig);
+ my $dbh = $opt_auth_db ? connect_auth()->dbconnect : SL::DB->client->dbh;
$dbh->{AutoCommit} = 0;
$dbh->{PrintWarn} = 0;
sub dump_unapplied {
my @results;
- my $dbh = $opt_auth_db ? connect_auth()->dbconnect : $form->dbconnect_noauto(\%myconfig);
+ my $dbh = $opt_auth_db ? connect_auth()->dbconnect : SL::DB->client->dbh;
$dbh->{PrintWarn} = 0;
$dbh->{PrintError} = 0;
#######
#######
-$locale = Locale->new;
-$form = Form->new;
+$locale = Locale->new;
+$form = Form->new;
+$::request = SL::Request->new(
+ cgi => CGI->new({}),
+ layout => SL::Layout::None->new,
+);
#######
#######
"graphviz:s" => \$opt_graphviz,
"format:s" => \$opt_format,
"user=s" => \$opt_user,
+ "client=s" => \$opt_client,
"apply=s" => \$opt_apply,
"applied" => \$opt_applied,
"create=s" => \$opt_create,
"type=s" => \$opt_type,
- "encoding=s" => \$opt_encoding,
"description=s" => \$opt_description,
"depends=s" => \@opt_depends,
"unapplied" => \$opt_unapplied,
show_help() if ($opt_help);
-$dbupgrader = SL::DBUpgrade2->new(form => $form, dbdriver => 'Pg', auth => $opt_auth_db);
+$dbupgrader = SL::DBUpgrade2->new(form => $form, auth => $opt_auth_db);
$controls = $dbupgrader->parse_dbupdate_controls->{all_controls};
dump_list() if ($opt_list);
dbupgrader => $dbupgrader,
type => $opt_type,
description => $opt_description,
- encoding => $opt_encoding,
depends => \@opt_depends) if ($opt_create);
+if ($opt_client && !connect_auth()->set_client($opt_client)) {
+ $form->error($form->format_string("The client '#1' does not exist.", $opt_client));
+}
+
if ($opt_user) {
+ $form->error("Need a client, too.") if !$auth || !$auth->client;
+
%myconfig = connect_auth()->read_user(login => $opt_user);
if (!$myconfig{login}) {
projects / kivitendo-erp.git / blobdiff