Hello,

I had some trouble running the tests provided for DBD::Oracle, because we have
many datastores under a single installation, which means I need to be able to
customize the datastore string used in connect().  Because DBI uses an
environment variable for this, DBI_DSN, it's preferable that the tests default
to this behavior as well.

Attached is my patch; please let me know if there's any problems with it?

Thank you,
Jill
-- 
            Jillian Vogel - - [EMAIL PROTECTED]
Web Team Programmer, M&SC - - Day: +61 8 8303 6378 
   University of Adelaide - - CRICOS Provider Number 00123M

diff -r -u DBD-Oracle-1.16/t/10general.t 
DBD-Oracle-1.16_modified_tests/t/10general.t
--- DBD-Oracle-1.16/t/10general.t       2004-10-18 17:55:11.000000000 +0930
+++ DBD-Oracle-1.16_modified_tests/t/10general.t        2006-01-11 
11:28:28.000000000 +1030
@@ -7,9 +7,9 @@
 $| = 1;
 
 plan tests => 31;
-
+my $dsn = $ENV{DBI_DSN} || 'dbi:Oracle:';
 my $dbuser = $ENV{ORACLE_USERID} || 'scott/tiger';
-my $dbh = DBI->connect('dbi:Oracle:', $dbuser, '');
+my $dbh = DBI->connect($dsn, $dbuser, '');
 
 unless($dbh) {
        BAILOUT("Unable to connect to Oracle ($DBI::errstr)\nTests skiped.\n");
diff -r -u DBD-Oracle-1.16/t/15nls.t DBD-Oracle-1.16_modified_tests/t/15nls.t
--- DBD-Oracle-1.16/t/15nls.t   2004-03-30 01:28:01.000000000 +0930
+++ DBD-Oracle-1.16_modified_tests/t/15nls.t    2006-01-11 11:28:28.000000000 
+1030
@@ -10,11 +10,12 @@
 
 $| = 1;
 
+my $dsn = $ENV{DBI_DSN} || 'dbi:Oracle:';
 my $dbuser = $ENV{ORACLE_USERID} || 'scott/tiger';
 
 SKIP :
 {
-    my $dbh = DBI->connect('dbi:Oracle:', $dbuser, '',
+    my $dbh = DBI->connect($dsn, $dbuser, '',
                           {
                            AutoCommit => 1,
                            PrintError => 1,
diff -r -u DBD-Oracle-1.16/t/20select.t 
DBD-Oracle-1.16_modified_tests/t/20select.t
--- DBD-Oracle-1.16/t/20select.t        2004-10-19 08:39:17.000000000 +0930
+++ DBD-Oracle-1.16_modified_tests/t/20select.t 2006-01-11 11:28:28.000000000 
+1030
@@ -18,8 +18,9 @@
 my $table = "dbd_ora__drop_me" . ($ENV{DBD_ORACLE_SEQ}||'');
 
 
+my $dsn = $ENV{DBI_DSN} || 'dbi:Oracle:';
 my $dbuser = $ENV{ORACLE_USERID} || 'scott/tiger';
-my $dbh = DBI->connect('dbi:Oracle:', $dbuser, '', {
+my $dbh = DBI->connect($dsn, $dbuser, '', {
        AutoCommit => 1,
        PrintError => 0,
 });
diff -r -u DBD-Oracle-1.16/t/25plsql.t 
DBD-Oracle-1.16_modified_tests/t/25plsql.t
--- DBD-Oracle-1.16/t/25plsql.t 2004-10-22 18:02:11.000000000 +0930
+++ DBD-Oracle-1.16_modified_tests/t/25plsql.t  2006-01-11 11:28:28.000000000 
+1030
@@ -19,8 +19,9 @@
 
 $| = 1;
 
+my $dsn = $ENV{DBI_DSN} || 'dbi:Oracle:';
 my $dbuser = $ENV{ORACLE_USERID} || 'scott/tiger';
-my $dbh = DBI->connect('dbi:Oracle:', $dbuser, '', { PrintError => 0 });
+my $dbh = DBI->connect($dsn, $dbuser, '', { PrintError => 0 });
 
 unless($dbh) {
        warn "Unable to connect to Oracle ($DBI::errstr)\nTests skiped.\n";
diff -r -u DBD-Oracle-1.16/t/40ph_type.t 
DBD-Oracle-1.16_modified_tests/t/40ph_type.t
--- DBD-Oracle-1.16/t/40ph_type.t       2004-10-19 08:39:17.000000000 +0930
+++ DBD-Oracle-1.16_modified_tests/t/40ph_type.t        2006-01-11 
11:28:28.000000000 +1030
@@ -22,7 +22,7 @@
 $^W = 1;
 
 my $dbuser = $ENV{ORACLE_USERID} || 'scott/tiger';
-my $dsn    = $ENV{ORACLE_DSN}    || 'dbi:Oracle:';
+my $dsn    = $ENV{ORACLE_DSN}    || $ENV{DBI_DSN} || 'dbi:Oracle:';
 my $dbh = DBI->connect($dsn, $dbuser, '', {
        AutoCommit => 0,
        PrintError => 1,
diff -r -u DBD-Oracle-1.16/t/50cursor.t 
DBD-Oracle-1.16_modified_tests/t/50cursor.t
--- DBD-Oracle-1.16/t/50cursor.t        2004-05-03 07:28:36.000000000 +0930
+++ DBD-Oracle-1.16_modified_tests/t/50cursor.t 2006-01-11 11:28:28.000000000 
+1030
@@ -20,8 +20,9 @@
 
 $| = 1;
 
+my $dsn = $ENV{DBI_DSN} || 'dbi:Oracle:';
 my $dbuser = $ENV{ORACLE_USERID} || 'scott/tiger';
-my $dbh = DBI->connect('dbi:Oracle:', $dbuser, '', { PrintError => 0 });
+my $dbh = DBI->connect($dsn, $dbuser, '', { PrintError => 0 });
 
 unless ($dbh) {
        warn "Unable to connect to Oracle as $dbuser ($DBI::errstr)\nTests 
skipped.\n";
diff -r -u DBD-Oracle-1.16/t/60reauth.t 
DBD-Oracle-1.16_modified_tests/t/60reauth.t
--- DBD-Oracle-1.16/t/60reauth.t        2004-10-22 02:21:32.000000000 +0930
+++ DBD-Oracle-1.16_modified_tests/t/60reauth.t 2006-01-11 11:28:28.000000000 
+1030
@@ -16,6 +16,8 @@
 use DBI;
 $| = 1;
 
+
+my $dsn = $ENV{DBI_DSN} || 'dbi:Oracle:';
 my $dbuser = $ENV{ORACLE_USERID} || 'scott/tiger';
 my $dbuser_2 = $ENV{ORACLE_USERID_2} || '';
 
@@ -32,7 +34,7 @@
     give_up("ORACLE_USERID_2 not unique.\nTests skipped.\n")
 }
 
-my $dbh = DBI->connect('dbi:Oracle:', $dbuser, '');
+my $dbh = DBI->connect($dsn, $dbuser, '');
 
 unless($dbh) {
     give_up("Unable to connect to Oracle ($DBI::errstr)\nTests skipped.\n");
diff -r -u DBD-Oracle-1.16/t/70meta.t DBD-Oracle-1.16_modified_tests/t/70meta.t
--- DBD-Oracle-1.16/t/70meta.t  2004-02-29 03:08:37.000000000 +1030
+++ DBD-Oracle-1.16_modified_tests/t/70meta.t   2006-01-11 11:28:28.000000000 
+1030
@@ -19,8 +19,9 @@
 
 $| = 1;
 
+my $dsn = $ENV{DBI_DSN} || 'dbi:Oracle:';
 my $dbuser = $ENV{ORACLE_USERID} || 'scott/tiger';
-my $dbh = DBI->connect('dbi:Oracle:', $dbuser, '', { PrintError => 0 });
+my $dbh = DBI->connect($dsn, $dbuser, '', { PrintError => 0 });
 
 unless ($dbh) {
        warn "Unable to connect to Oracle as $dbuser ($DBI::errstr)\nTests 
skipped.\n";
diff -r -u DBD-Oracle-1.16/t/nchar_test_lib.pl 
DBD-Oracle-1.16_modified_tests/t/nchar_test_lib.pl
--- DBD-Oracle-1.16/t/nchar_test_lib.pl 2004-10-19 08:39:17.000000000 +0930
+++ DBD-Oracle-1.16_modified_tests/t/nchar_test_lib.pl  2006-01-11 
11:28:28.000000000 +1030
@@ -143,9 +143,9 @@
 
 sub db_handle
 {
-
+    my $dsn = $ENV{DBI_DSN} || 'dbi:Oracle:';
     my $dbuser = $ENV{ORACLE_USERID} || 'scott/tiger';
-    my $dbh = DBI->connect('dbi:Oracle:', $dbuser, '', {
+    my $dbh = DBI->connect($dsn, $dbuser, '', {
         AutoCommit => 1,
         PrintError => 1,
         ora_envhp  => 0, # force fresh environment (with current NLS env vars)

Reply via email to