[svn:dbd-oracle] r14172 - in dbd-oracle/branches/DRCP_1.25: . t

Author: byterock
Date: Fri Jun 18 19:46:07 2010
New Revision: 14172

Modified:
   dbd-oracle/branches/DRCP_1.25/dbdimp.c
   dbd-oracle/branches/DRCP_1.25/t/10general.t
   dbd-oracle/branches/DRCP_1.25/t/nchar_test_lib.pl

Log:
just a check in for end of day THIS TIME NO FOOLING

Modified: dbd-oracle/branches/DRCP_1.25/dbdimp.c
==============================================================================
--- dbd-oracle/branches/DRCP_1.25/dbdimp.c	(original)
+++ dbd-oracle/branches/DRCP_1.25/dbdimp.c	Fri Jun 18 19:46:07 2010
@@ -780,7 +780,8 @@
 			{
 				SV **sess_mode_type_sv;
 				ub4  sess_mode_type = OCI_DEFAULT;
-				ub4  cred_type = ora_parse_uid(imp_dbh, &uid, &pwd);
+				ub4  cred_type;
+
 
 				DBD_ATTRIB_GET_IV(attr, "ora_session_mode",16, sess_mode_type_sv, sess_mode_type);
 
@@ -793,6 +794,8 @@
 dbd_verbose=15;
 				if (imp_dbh->using_drcp) { /* connect uisng a DRCP */
 					ub4   purity = OCI_ATTR_PURITY_SELF;
+
+
 					OCIHandleAlloc_ok(imp_dbh->envhp, &imp_dbh->poolhp, OCI_HTYPE_SPOOL, status);
 PerlIO_printf(DBILOGFP,"OCIHandleAlloc_ok status=%s\n",oci_status_name(status));
 					OCISessionPoolCreate_log_stat(imp_dbh->envhp,
@@ -824,7 +827,7 @@
 
 				    OCIAttrSet_log_stat(imp_dbh->authp, (ub4) OCI_HTYPE_AUTHINFO,
 								&purity, (ub4) 0,(ub4) OCI_ATTR_PURITY, imp_dbh->errhp, status);
-
+					cred_type = ora_parse_uid(imp_dbh, &uid, &pwd);
 					OCISessionGet_log_stat(imp_dbh->envhp, imp_dbh->errhp, &imp_dbh->svchp, imp_dbh->authp,
 								imp_dbh->pool_name, (ub4)strlen((char *)imp_dbh->pool_name), status);
 
@@ -841,8 +844,11 @@
 				else {
 #endif
 
+
+					OCIHandleAlloc_ok(imp_dbh->envhp, &imp_dbh->svchp, OCI_HTYPE_SVCCTX, status);
 					OCIServerAttach_log_stat(imp_dbh, dbname,OCI_DEFAULT, status);
 					OCIHandleAlloc_ok(imp_dbh->envhp, &imp_dbh->seshp, OCI_HTYPE_SESSION, status);
+					cred_type = ora_parse_uid(imp_dbh, &uid, &pwd);
 					OCISessionBegin_log_stat( imp_dbh->svchp, imp_dbh->errhp, imp_dbh->seshp,cred_type, sess_mode_type, status);
 					if (status == OCI_SUCCESS_WITH_INFO) {
 						/* eg ORA-28011: the account will expire soon; change your password now */

Modified: dbd-oracle/branches/DRCP_1.25/t/10general.t
==============================================================================
--- dbd-oracle/branches/DRCP_1.25/t/10general.t	(original)
+++ dbd-oracle/branches/DRCP_1.25/t/10general.t	Fri Jun 18 19:46:07 2010
@@ -19,6 +19,7 @@
 
 my $dsn = oracle_test_dsn();
 my $dbuser = $ENV{ORACLE_USERID} || 'scott/tiger';
+warn("dsn=$dsn, user=$dbuser\n");
 my $dbh = DBI->connect($dsn, $dbuser, '');
 
 unless($dbh) {

Modified: dbd-oracle/branches/DRCP_1.25/t/nchar_test_lib.pl
==============================================================================
--- dbd-oracle/branches/DRCP_1.25/t/nchar_test_lib.pl	(original)
+++ dbd-oracle/branches/DRCP_1.25/t/nchar_test_lib.pl	Fri Jun 18 19:46:07 2010
@@ -160,8 +160,11 @@
 sub oracle_test_dsn
 {
     my( $default, $dsn ) = ( 'dbi:Oracle:', $ENV{ORACLE_DSN} );
+    
+    
     $dsn ||= $ENV{DBI_DSN} if $ENV{DBI_DSN} && ($ENV{DBI_DSN} =~ /^$default/io);
     $dsn ||= $default;
+    
     return $dsn;
 }