summaryrefslogtreecommitdiff
path: root/rt/sbin
diff options
context:
space:
mode:
authorivan <ivan>2006-10-17 08:51:01 +0000
committerivan <ivan>2006-10-17 08:51:01 +0000
commita513c0bef534d05f03c1242831b6f3be19b97dae (patch)
tree2f2a88caf104fef31a3a8dc190ac3fe41dd017c1 /rt/sbin
parentd4d0590bef31071e8809ec046717444b95b3f30a (diff)
import rt 3.4.5
Diffstat (limited to 'rt/sbin')
-rw-r--r--rt/sbin/rt-setup-database.in7
-rw-r--r--rt/sbin/rt-test-dependencies.in2
2 files changed, 8 insertions, 1 deletions
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index 01c7b3c..c432cc9 100644
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -130,7 +130,14 @@ if ( $args{'action'} eq 'init' ) {
unless ($RT::DatabaseType eq 'SQLite') {
$dbh->disconnect;
+
+ if ($RT::DatabaseType eq "Oracle") {
+ $RT::DatabasePassword = $RT::DatabasePassword; #Warning avidance
+ $dbh = DBI->connect( $Handle->DSN, ${RT::DatabaseUser}, ${RT::DatabasePassword} ) || die $DBI::errstr;
+ } else {
+
$dbh = DBI->connect( $Handle->DSN, $args{'dba'}, $args{'dba-password'} ) || die $DBI::errstr;
+ }
}
print "Now populating database schema.\n";
insert_schema();
diff --git a/rt/sbin/rt-test-dependencies.in b/rt/sbin/rt-test-dependencies.in
index f79e4e5..ce1f441 100644
--- a/rt/sbin/rt-test-dependencies.in
+++ b/rt/sbin/rt-test-dependencies.in
@@ -153,7 +153,7 @@ Digest::MD5 2.27
DBI 1.37
Test::Inline
Class::ReturnValue 0.40
-DBIx::SearchBuilder 1.26
+DBIx::SearchBuilder 1.35
Text::Template
File::Spec 0.8
HTML::Entities