From a513c0bef534d05f03c1242831b6f3be19b97dae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Oct 2006 08:51:01 +0000
Subject: import rt 3.4.5

---
 rt/sbin/rt-setup-database.in    | 7 +++++++
 rt/sbin/rt-test-dependencies.in | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'rt/sbin')

diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index 01c7b3cf1..c432cc97b 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 f79e4e5c2..ce1f44150 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 
-- 
cgit v1.2.1