projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT 4.0.13
[freeside.git]
/
rt
/
sbin
/
rt-setup-database.in
diff --git
a/rt/sbin/rt-setup-database.in
b/rt/sbin/rt-setup-database.in
index
2efb9f3
..
f1e35f5
100644
(file)
--- a/
rt/sbin/rt-setup-database.in
+++ b/
rt/sbin/rt-setup-database.in
@@
-3,7
+3,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
3
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-206,7
+206,7
@@
foreach my $action ( @actions ) {
sub action_create {
my %args = @_;
my $dbh = get_system_dbh();
sub action_create {
my %args = @_;
my $dbh = get_system_dbh();
- my ($status, $msg) = RT::Handle->CheckCompatibility( $dbh, '
pr
e' );
+ my ($status, $msg) = RT::Handle->CheckCompatibility( $dbh, '
creat
e' );
return ($status, $msg) unless $status;
print "Now creating a $db_type database $db_name for RT.\n";
return ($status, $msg) unless $status;
print "Now creating a $db_type database $db_name for RT.\n";
@@
-234,7
+234,7
@@
END
sub action_schema {
my %args = @_;
my $dbh = get_admin_dbh();
sub action_schema {
my %args = @_;
my $dbh = get_admin_dbh();
- my ($status, $msg) = RT::Handle->CheckCompatibility( $dbh, '
pre
' );
+ my ($status, $msg) = RT::Handle->CheckCompatibility( $dbh, '
schema
' );
return ($status, $msg) unless $status;
print "Now populating database schema.\n";
return ($status, $msg) unless $status;
print "Now populating database schema.\n";
@@
-244,7
+244,7
@@
sub action_schema {
sub action_acl {
my %args = @_;
my $dbh = get_admin_dbh();
sub action_acl {
my %args = @_;
my $dbh = get_admin_dbh();
- my ($status, $msg) = RT::Handle->CheckCompatibility( $dbh, '
pre
' );
+ my ($status, $msg) = RT::Handle->CheckCompatibility( $dbh, '
acl
' );
return ($status, $msg) unless $status;
print "Now inserting database ACLs.\n";
return ($status, $msg) unless $status;
print "Now inserting database ACLs.\n";
@@
-257,7
+257,7
@@
sub action_coredata {
$RT::Handle->dbh( undef );
RT::ConnectToDatabase();
RT::InitLogging();
$RT::Handle->dbh( undef );
RT::ConnectToDatabase();
RT::InitLogging();
- my ($status, $msg) = RT::Handle->CheckCompatibility( $RT::Handle->dbh, '
pre
' );
+ my ($status, $msg) = RT::Handle->CheckCompatibility( $RT::Handle->dbh, '
coredata
' );
return ($status, $msg) unless $status;
print "Now inserting RT core system objects.\n";
return ($status, $msg) unless $status;
print "Now inserting RT core system objects.\n";
@@
-268,7
+268,7
@@
sub action_insert {
my %args = @_;
$RT::Handle = RT::Handle->new;
RT::Init();
my %args = @_;
$RT::Handle = RT::Handle->new;
RT::Init();
- my ($status, $msg) = RT::Handle->CheckCompatibility( $RT::Handle->dbh, '
pre
' );
+ my ($status, $msg) = RT::Handle->CheckCompatibility( $RT::Handle->dbh, '
insert
' );
return ($status, $msg) unless $status;
print "Now inserting data.\n";
return ($status, $msg) unless $status;
print "Now inserting data.\n";
@@
-308,6
+308,7
@@
sub action_upgrade {
return (0, "Couldn't read dir '$base_dir' with upgrade data")
unless -d $base_dir || -r _;
return (0, "Couldn't read dir '$base_dir' with upgrade data")
unless -d $base_dir || -r _;
+ my $version_word_regex = join '|', RT::Handle->version_words;
my $upgrading_from = undef;
do {
if ( defined $upgrading_from ) {
my $upgrading_from = undef;
do {
if ( defined $upgrading_from ) {
@@
-318,7
+319,7
@@
sub action_upgrade {
$upgrading_from = scalar <STDIN>;
chomp $upgrading_from;
$upgrading_from =~ s/\s+//g;
$upgrading_from = scalar <STDIN>;
chomp $upgrading_from;
$upgrading_from =~ s/\s+//g;
- } while $upgrading_from !~ /^\d+\.\d+\.\
w+
$/;
+ } while $upgrading_from !~ /^\d+\.\d+\.\
d+(?:$version_word_regex)?\d*
$/;
my $upgrading_to = $RT::VERSION;
return (0, "The current version $upgrading_to is lower than $upgrading_from")
my $upgrading_to = $RT::VERSION;
return (0, "The current version $upgrading_to is lower than $upgrading_from")
@@
-353,7
+354,7
@@
sub action_upgrade {
chomp $custom_upgrading_to;
$custom_upgrading_to =~ s/\s+//g;
last unless $custom_upgrading_to;
chomp $custom_upgrading_to;
$custom_upgrading_to =~ s/\s+//g;
last unless $custom_upgrading_to;
- } while $custom_upgrading_to !~ /^\d+\.\d+\.\
w+
$/;
+ } while $custom_upgrading_to !~ /^\d+\.\d+\.\
d+(?:$version_word_regex)?\d*
$/;
if ( $custom_upgrading_to ) {
return (
if ( $custom_upgrading_to ) {
return (