add simple scalars to impending_recur_notification

[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 01c7b3c..06c04dc 100644 (file)
--- 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();
@@ -151,6 +158,9 @@ elsif ( $args{'action'} eq 'drop' ) {
     }
     drop_db();
 }
+elsif ( $args{'action'} eq 'insert_initial' ) {
+    insert_initial_data();
+}
 elsif ( $args{'action'} eq 'insert' ) {
     insert_data( $args{'datafile'} || ($args{'datadir'}."/content"));
 }
@@ -643,6 +653,8 @@ $0: Set up RT's database
 --action        init    Initialize the database
                 drop    Drop the database. 
                         This will ERASE ALL YOUR DATA
+                insert_initial 
+                        Insert RT's core system objects
                 insert  Insert data into RT's database. 
                         By default, will use RT's installation data.
                         To use a local or supplementary datafile, specify it