[svn:dbd-oracle] r14824 - dbd-oracle/branches/by_by_oraperl

Author: byterock
Date: Tue Apr  5 16:54:26 2011
New Revision: 14824

Removed:
   dbd-oracle/branches/by_by_oraperl/Oraperl.pm
   dbd-oracle/branches/by_by_oraperl/oraperl.ph
   dbd-oracle/branches/by_by_oraperl/test.pl
Modified:
   dbd-oracle/branches/by_by_oraperl/Makefile.PL
   dbd-oracle/branches/by_by_oraperl/dbdimp.c
   dbd-oracle/branches/by_by_oraperl/oci8.c

Log:
by by oraperl

Modified: dbd-oracle/branches/by_by_oraperl/Makefile.PL
==============================================================================
--- dbd-oracle/branches/by_by_oraperl/Makefile.PL	(original)
+++ dbd-oracle/branches/by_by_oraperl/Makefile.PL	Tue Apr  5 16:54:26 2011
@@ -1673,22 +1673,12 @@
     sub post_initialize {
 	my $self = shift;
 
-	if (-f "$Config{installprivlib}/DBD/Oraperl.pm"){ # very old now
-	    print "
-Please note: the Oraperl.pm installation location has changed.
-It was: $Config{installprivlib}/DBD/Oraperl.pm
-Is now: $Config{installprivlib}/Oraperl.pm
-You have an old copy which you should delete when installing this one.\n";
-	}
 
 	print "\nNote: \$ORACLE_HOME/lib must be added to your $need_ldlp_env environment variable\n",
 	      "before running \"make test\" and whenever DBD::Oracle is used.\n\n"
 	    if $need_ldlp_env && ($ENV{$need_ldlp_env}||'') !~ m:\Q$OH/lib\b:;
 
-	# Ensure Oraperl.pm and oraperl.ph are installed into top lib dir
-	$self->{PM}->{'Oraperl.pm'} = '$(INST_LIB)/Oraperl.pm';
-	$self->{PM}->{'oraperl.ph'} = '$(INST_LIB)/oraperl.ph';
-
+	
 	eval {	# This chunk is for Oracle::OCI
 	    require Data::Dumper;
 	    print main::MK_PM Data::Dumper->Purity(1)->Terse(0)->Indent(1)->Useqq(1)

Modified: dbd-oracle/branches/by_by_oraperl/dbdimp.c
==============================================================================
--- dbd-oracle/branches/by_by_oraperl/dbdimp.c	(original)
+++ dbd-oracle/branches/by_by_oraperl/dbdimp.c	Tue Apr  5 16:54:26 2011
@@ -4103,8 +4103,6 @@
 	SV *cachesv = NULL;
 	char *key = SvPV(keysv,kl);
 	if( imp_sth ) { /* For GCC not to warn on unused argument */}
-/*	int on = SvTRUE(valuesv);
-	int oraperl = DBIc_COMPAT(imp_sth); */
 	if (strEQ(key, "ora_fetchtest")) {
 		ora_fetchtest = SvIV(valuesv);
 	}
@@ -4127,7 +4125,6 @@
 	SV *retsv = NULL;
 	/* Default to caching results for DBI dispatch quick_FETCH	*/
 	int cacheit = TRUE;
-	/* int oraperl = DBIc_COMPAT(imp_sth); */
 
 	if (kl==13 && strEQ(key, "NUM_OF_PARAMS"))	/* handled by DBI */
 		return Nullsv;

Modified: dbd-oracle/branches/by_by_oraperl/oci8.c
==============================================================================
--- dbd-oracle/branches/by_by_oraperl/oci8.c	(original)
+++ dbd-oracle/branches/by_by_oraperl/oci8.c	Tue Apr  5 16:54:26 2011
@@ -45,11 +45,10 @@
 dbd_init_oci_drh(imp_drh_t * imp_drh)
 {
 	dTHX;
-	imp_drh->ora_long	= perl_get_sv("Oraperl::ora_long",	  GV_ADDMULTI);
-	imp_drh->ora_trunc	= perl_get_sv("Oraperl::ora_trunc",	 GV_ADDMULTI);
-	imp_drh->ora_cache	= perl_get_sv("Oraperl::ora_cache",	 GV_ADDMULTI);
-	imp_drh->ora_cache_o = perl_get_sv("Oraperl::ora_cache_o",	GV_ADDMULTI);
-
+	imp_drh->ora_long	 = perl_get_sv("DBD::Oracle::ora_long",	  GV_ADDMULTI);
+	imp_drh->ora_trunc	 = perl_get_sv("DBD::Oracle::ora_trunc",	 GV_ADDMULTI);
+	imp_drh->ora_cache	 = perl_get_sv("DBD::Oracle::ora_cache",	 GV_ADDMULTI);
+	imp_drh->ora_cache_o = perl_get_sv("DBD::Oracle::ora_cache_o",	GV_ADDMULTI);
 }
 
 char *
@@ -991,7 +990,7 @@
 	if (DBIc_COMPAT(imp_sth)) {
 		static SV *ora_pad_empty;
 		if (!ora_pad_empty) {
-			ora_pad_empty= perl_get_sv("Oraperl::ora_pad_empty", GV_ADDMULTI);
+			ora_pad_empty= perl_get_sv("DBD::Oracle::ora_pad_empty", GV_ADDMULTI);
 			if (!SvOK(ora_pad_empty) && getenv("ORAPERL_PAD_EMPTY"))
 				sv_setiv(ora_pad_empty, atoi(getenv("ORAPERL_PAD_EMPTY")));
 		}