[svn:dbd-oracle] r13714 - in dbd-oracle/branches/DBDOracle8: . lib/DBD/Oracle lib/DBD/Oracle8 t
[email protected] Thu, 7 Jan 2010 17:40:09 -0800 (PST)
Newsgroups
perl.dbd.oracle.changes
Message-ID
<[email protected] >
Author: byterock
Date: Thu Jan 7 17:40:08 2010
New Revision: 13714
Added:
dbd-oracle/branches/DBDOracle8/Oracle8.xs
- copied, changed from r13712, /dbd-oracle/branches/DBDOracle8/Oracle.xs
dbd-oracle/branches/DBDOracle8/Oracle8.xsi
- copied, changed from r13712, /dbd-oracle/branches/DBDOracle8/Oracle.xsi
dbd-oracle/branches/DBDOracle8/lib/DBD/Oracle8/
- copied from r13712, /dbd-oracle/branches/DBDOracle8/lib/DBD/Oracle/
Removed:
dbd-oracle/branches/DBDOracle8/Oracle.xs
dbd-oracle/branches/DBDOracle8/Oracle.xsi
dbd-oracle/branches/DBDOracle8/lib/DBD/Oracle/
Modified:
dbd-oracle/branches/DBDOracle8/Makefile
dbd-oracle/branches/DBDOracle8/Oracle.obj
dbd-oracle/branches/DBDOracle8/Oracle8.pm
dbd-oracle/branches/DBDOracle8/dbdimp.obj
dbd-oracle/branches/DBDOracle8/mk.pm
dbd-oracle/branches/DBDOracle8/oci8.obj
dbd-oracle/branches/DBDOracle8/t/01base.t
dbd-oracle/branches/DBDOracle8/t/nchar_test_lib.pl
dbd-oracle/branches/DBDOracle8/vc70.pdb
Log:
Modified: dbd-oracle/branches/DBDOracle8/Makefile
==============================================================================
--- dbd-oracle/branches/DBDOracle8/Makefile (original)
+++ dbd-oracle/branches/DBDOracle8/Makefile Thu Jan 7 17:40:08 2010
@@ -15,7 +15,7 @@
# DEFINE => q[ -DUTF8_SUPPORT -DORA_OCI_VERSION=\"8.1.7.0\"]
# DIR => []
# EXE_FILES => [q[ora_explain]]
-# INC => q[-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/]
+# INC => q[-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:\Perl\site\lib\auto\DBI]
# LIBS => [q[-LD:/oracle/ora81/oci/LIB/MSVC OCI]]
# NAME => q[DBD::Oracle8]
# OBJECT => q[$(O_FILES)]
@@ -161,7 +161,7 @@
PARENT_NAME = DBD
DLBASE = $(BASEEXT)
VERSION_FROM = Oracle8.pm
-INC = -ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/
+INC = -ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:\Perl\site\lib\auto\DBI
DEFINE = -DUTF8_SUPPORT -DORA_OCI_VERSION=\"8.1.7.0\"
OBJECT = $(O_FILES)
LDFROM = $(OBJECT)
@@ -169,11 +169,13 @@
BOOTDEP =
# Handy lists of source code files:
-XS_FILES = Oracle.xs
+XS_FILES = Oracle8.xs
C_FILES = Oracle.c \
+ Oracle8.c \
dbdimp.c \
oci8.c
O_FILES = Oracle.obj \
+ Oracle8.obj \
dbdimp.obj \
oci8.obj
H_FILES = Oracle.h \
@@ -208,7 +210,7 @@
Oracle8.pm \
Oraperl.pm \
dbdimp.h \
- lib/DBD/Oracle/GetInfo.pm \
+ lib/DBD/Oracle8/GetInfo.pm \
mk.pm \
ocitrace.h \
oraperl.ph
@@ -221,12 +223,12 @@
$(INST_ARCHAUTODIR)/dbdimp.h \
oraperl.ph \
$(INST_LIB)/oraperl.ph \
+ lib/DBD/Oracle8/GetInfo.pm \
+ blib\lib\DBD\Oracle8\GetInfo.pm \
ocitrace.h \
$(INST_ARCHAUTODIR)/ocitrace.h \
Oraperl.pm \
$(INST_LIB)/Oraperl.pm \
- lib/DBD/Oracle/GetInfo.pm \
- blib\lib\DBD\Oracle\GetInfo.pm \
mk.pm \
$(INST_ARCHAUTODIR)/mk.pm
@@ -601,13 +603,13 @@
perl$(EXE_EXT) tmon.out \
$(INST_ARCHAUTODIR)\extralibs.all *$(OBJ_EXT) \
pm_to_blib blibdirs.ts \
- Oracle.c core.[0-9][0-9][0-9][0-9][0-9] \
- *perl.core core.*perl.*.? \
- $(MAKE_APERL_FILE) perl \
- $(BASEEXT).def core.[0-9][0-9][0-9] \
- mon.out lib$(BASEEXT).def \
- perlmain.c perl.exe \
- so_locations $(BASEEXT).exp
+ core.[0-9][0-9][0-9][0-9][0-9] *perl.core \
+ core.*perl.*.? $(MAKE_APERL_FILE) \
+ perl $(BASEEXT).def \
+ core.[0-9][0-9][0-9] mon.out \
+ lib$(BASEEXT).def perlmain.c \
+ perl.exe so_locations \
+ $(BASEEXT).exp Oracle8.c
- $(RM_RF) \
*.pdb ora_explain \
dll.base DBD_ORA_OBJ.* \
@@ -937,7 +939,7 @@
$(OBJECT) : $(PERL_HDRS)
-Oracle.c : $(XSUBPPDEPS)
+Oracle8.c : $(XSUBPPDEPS)
# --- MakeMaker makefile section:
@@ -1030,9 +1032,9 @@
Oracle8.pm $(INST_LIB)\DBD\Oracle8.pm \
dbdimp.h $(INST_ARCHAUTODIR)/dbdimp.h \
oraperl.ph $(INST_LIB)/oraperl.ph \
+ lib/DBD/Oracle8/GetInfo.pm blib\lib\DBD\Oracle8\GetInfo.pm \
ocitrace.h $(INST_ARCHAUTODIR)/ocitrace.h \
Oraperl.pm $(INST_LIB)/Oraperl.pm \
- lib/DBD/Oracle/GetInfo.pm blib\lib\DBD\Oracle\GetInfo.pm \
mk.pm $(INST_ARCHAUTODIR)/mk.pm
$(NOECHO) $(TOUCH) pm_to_blib
@@ -1043,8 +1045,8 @@
# --- MakeMaker postamble section:
# --- This section was generated by DBI::DBD::dbd_postamble()
-DBI_INSTARCH_DIR=C:/Perl/site/lib/auto/DBI/
-DBI_DRIVER_XST=$(DBI_INSTARCH_DIR)/Driver.xst
+DBI_INSTARCH_DIR=C:\Perl\site\lib\auto\DBI
+DBI_DRIVER_XST=C:\Perl\site\lib\auto\DBI\Driver.xst
# The main dependancy (technically correct but probably not used)
$(BASEEXT).c: $(BASEEXT).xsi
@@ -1052,7 +1054,7 @@
# This dependancy is needed since MakeMaker uses the .xs.o rule
$(BASEEXT)$(OBJ_EXT): $(BASEEXT).xsi
-$(BASEEXT).xsi: $(DBI_DRIVER_XST) $(DBI_INSTARCH_DIR)/Driver_xst.h
+$(BASEEXT).xsi: $(DBI_DRIVER_XST) C:\Perl\site\lib\auto\DBI\Driver_xst.h
$(PERL) -p -e "s/~DRIVER~/$(BASEEXT)/g" $(DBI_DRIVER_XST) > $(BASEEXT).xsi
# ---
Modified: dbd-oracle/branches/DBDOracle8/Oracle.obj
==============================================================================
Binary files. No diff available.
Modified: dbd-oracle/branches/DBDOracle8/Oracle8.pm
==============================================================================
--- dbd-oracle/branches/DBDOracle8/Oracle8.pm (original)
+++ dbd-oracle/branches/DBDOracle8/Oracle8.pm Thu Jan 7 17:40:08 2010
@@ -6,12 +6,12 @@
require 5.003;
-$DBD::Oracle::VERSION = '1.17';
+$DBD::Oracle8::VERSION = '1.00';
my $ORACLE_ENV = ($^O eq 'VMS') ? 'ORA_ROOT' : 'ORACLE_HOME';
{
- package DBD::Oracle;
+ package DBD::Oracle8;
use DBI ();
use DynaLoader ();
@@ -33,7 +33,7 @@
require_version DBI 1.28;
- bootstrap DBD::Oracle $VERSION;
+ bootstrap DBD::Oracle8 $VERSION;
$drh = undef; # holds driver handle once initialised
@@ -44,7 +44,7 @@
sub driver{
return $drh if $drh;
my($class, $attr) = @_;
- my $oci = DBD::Oracle::ORA_OCI();
+ my $oci = DBD::Oracle8::ORA_OCI();
$class .= "::dr";
@@ -55,19 +55,19 @@
'Version' => $VERSION,
'Err' => \my $err,
'Errstr' => \my $errstr,
- 'Attribution' => "DBD::Oracle $VERSION using OCI$oci by Tim Bunce",
+ 'Attribution' => "DBD::Oracle8 $VERSION using OCI$oci by Tim Bunce",
});
- DBD::Oracle::dr::init_oci($drh) ;
+ DBD::Oracle8::dr::init_oci($drh) ;
$drh->STORE('ShowErrorStatement', 1);
if ($DBI::VERSION >= 1.37) {
- DBD::Oracle::db->install_method("ora_lob_read");
- DBD::Oracle::db->install_method("ora_lob_write");
- DBD::Oracle::db->install_method("ora_lob_append");
- DBD::Oracle::db->install_method("ora_lob_trim");
- DBD::Oracle::db->install_method("ora_lob_length");
- DBD::Oracle::db->install_method("ora_nls_parameters");
- DBD::Oracle::db->install_method("ora_can_unicode");
+ DBD::Oracle8::db->install_method("ora_lob_read");
+ DBD::Oracle8::db->install_method("ora_lob_write");
+ DBD::Oracle8::db->install_method("ora_lob_append");
+ DBD::Oracle8::db->install_method("ora_lob_trim");
+ DBD::Oracle8::db->install_method("ora_lob_length");
+ DBD::Oracle8::db->install_method("ora_nls_parameters");
+ DBD::Oracle8::db->install_method("ora_can_unicode");
}
$drh;
@@ -91,7 +91,7 @@
}
-{ package DBD::Oracle::dr; # ====== DRIVER ======
+{ package DBD::Oracle8::dr; # ====== DRIVER ======
use strict;
my %dbnames = (); # holds list of known databases (oratab + tnsnames)
@@ -99,7 +99,7 @@
sub load_dbnames {
my ($drh) = @_;
my $debug = $drh->debug;
- my $oracle_home = DBD::Oracle::ora_env_var($ORACLE_ENV);
+ my $oracle_home = DBD::Oracle8::ora_env_var($ORACLE_ENV);
local *FH;
my $d;
@@ -107,13 +107,13 @@
# XXX experimental, will probably change
$drh->trace_msg("Trying to fetch ORACLE_HOME and ORACLE_SID from the registry.\n")
if $debug;
- my $sid = DBD::Oracle::ora_env_var("ORACLE_SID");
+ my $sid = DBD::Oracle8::ora_env_var("ORACLE_SID");
$dbnames{$sid} = $oracle_home if $sid and $oracle_home;
$drh->trace_msg("Found $sid \@ $oracle_home.\n") if $debug && $sid;
}
# get list of 'local' database SIDs from oratab
- foreach $d (qw(/etc /var/opt/oracle), DBD::Oracle::ora_env_var("TNS_ADMIN")) {
+ foreach $d (qw(/etc /var/opt/oracle), DBD::Oracle8::ora_env_var("TNS_ADMIN")) {
next unless defined $d;
next unless open(FH, "<$d/oratab");
$drh->trace_msg("Loading $d/oratab\n") if $debug;
@@ -134,7 +134,7 @@
"$oracle_home/net80/admin", # OCI 8.0
) if $oracle_home;
push @tns_admin, "/var/opt/oracle";
- foreach $d ( DBD::Oracle::ora_env_var("TNS_ADMIN"), ".", @tns_admin ) {
+ foreach $d ( DBD::Oracle8::ora_env_var("TNS_ADMIN"), ".", @tns_admin ) {
next unless $d && open(FH, "<$d/tnsnames.ora");
$drh->trace_msg("Loading $d/tnsnames.ora\n") if $debug;
local *_;
@@ -219,7 +219,7 @@
# Call Oracle OCI logon func in Oracle.xs file
# and populate internal handle data.
- DBD::Oracle::db::_login($dbh, $dbname, $user, $auth, $attr)
+ DBD::Oracle8::db::_login($dbh, $dbname, $user, $auth, $attr)
or return undef;
if ($attr && $attr->{ora_module_name}) {
@@ -243,7 +243,7 @@
}
-{ package DBD::Oracle::db; # ====== DATABASE ======
+{ package DBD::Oracle8::db; # ====== DATABASE ======
use strict;
use DBI qw(:sql_types);
@@ -259,7 +259,7 @@
# Call Oracle OCI parse func in Oracle.xs file.
# and populate internal handle data.
- DBD::Oracle::st::_prepare($sth, $statement, @attribs)
+ DBD::Oracle8::st::_prepare($sth, $statement, @attribs)
or return undef;
$sth;
@@ -284,8 +284,8 @@
sub get_info {
my($dbh, $info_type) = @_;
- require DBD::Oracle::GetInfo;
- my $v = $DBD::Oracle::GetInfo::info{int($info_type)};
+ require DBD::Oracle8::GetInfo;
+ my $v = $DBD::Oracle8::GetInfo::info{int($info_type)};
$v = $v->($dbh) if ref $v eq 'CODE';
return $v;
}
@@ -631,8 +631,8 @@
sub type_info_all {
my ($dbh) = @_;
- my $version = ( ora_server_version($dbh)->[0] < DBD::Oracle::ORA_OCI() )
- ? ora_server_version($dbh)->[0] : DBD::Oracle::ORA_OCI();
+ my $version = ( ora_server_version($dbh)->[0] < DBD::Oracle8::ORA_OCI() )
+ ? ora_server_version($dbh)->[0] : DBD::Oracle8::ORA_OCI();
my $vc2len = ( $version < 8 ) ? "2000" : "4000";
my $type_info_all = [
@@ -827,10 +827,10 @@
return $dbh->{ora_can_unicode};
}
-} # end of package DBD::Oracle::db
+} # end of package DBD::Oracle8::db
-{ package DBD::Oracle::st; # ====== STATEMENT ======
+{ package DBD::Oracle8::st; # ====== STATEMENT ======
# all done in XS
}
@@ -841,7 +841,7 @@
=head1 NAME
-DBD::Oracle - Oracle database driver for the DBI module
+DBD::Oracle8 - Oracle database driver for the DBI module
=head1 SYNOPSIS
@@ -854,12 +854,12 @@
# See the DBI module documentation for full details
# for some advanced uses you may need Oracle type values:
- use DBD::Oracle qw(:ora_types);
+ use DBD::Oracle8 qw(:ora_types);
=head1 DESCRIPTION
-DBD::Oracle is a Perl module which works with the DBI module to provide
+DBD::Oracle8 is a Perl module which works with the DBI module to provide
access to Oracle databases.
=head1 CONNECTING TO ORACLE
@@ -875,7 +875,7 @@
$dbh = DBI->connect("dbi:Oracle:host=myhost.com;sid=ORCL", $user, $passwd);
-then DBD::Oracle will construct a full connection descriptor string
+then DBD::Oracle8 will construct a full connection descriptor string
for you and Oracle will not need to consult the tnsname.ora file.
If a C<port> number is not specified then the descriptor will try both
Copied: dbd-oracle/branches/DBDOracle8/Oracle8.xs (from r13712, /dbd-oracle/branches/DBDOracle8/Oracle.xs)
==============================================================================
--- /dbd-oracle/branches/DBDOracle8/Oracle.xs (original)
+++ dbd-oracle/branches/DBDOracle8/Oracle8.xs Thu Jan 7 17:40:08 2010
@@ -2,7 +2,7 @@
DBISTATE_DECLARE;
-MODULE = DBD::Oracle PACKAGE = DBD::Oracle
+MODULE = DBD::Oracle8 PACKAGE = DBD::Oracle8
I32
constant(name=Nullch)
@@ -30,7 +30,7 @@
CODE:
if (!ix) {
if (!name) name = GvNAME(CvGV(cv));
- croak("Unknown DBD::Oracle constant '%s'", name);
+ croak("Unknown DBD::Oracle8 constant '%s'", name);
}
else RETVAL = ix;
OUTPUT:
@@ -67,9 +67,9 @@
#endif /* __CYGWIN32__ */
-INCLUDE: Oracle.xsi
+INCLUDE: Oracle8.xsi
-MODULE = DBD::Oracle PACKAGE = DBD::Oracle::st
+MODULE = DBD::Oracle8 PACKAGE = DBD::Oracle8::st
void
ora_fetch(sth)
@@ -122,7 +122,7 @@
ST(0) = dbd_st_cancel(sth, imp_sth) ? &sv_yes : &sv_no;
-MODULE = DBD::Oracle PACKAGE = DBD::Oracle::db
+MODULE = DBD::Oracle8 PACKAGE = DBD::Oracle8::db
void
reauthenticate(dbh, uid, pwd)
@@ -351,7 +351,7 @@
-MODULE = DBD::Oracle PACKAGE = DBD::Oracle::dr
+MODULE = DBD::Oracle8 PACKAGE = DBD::Oracle8::dr
void
init_oci(drh)
@@ -361,6 +361,6 @@
dbd_init_oci(DBIS) ;
dbd_init_oci_drh(imp_drh) ;
-
-
+
+
Copied: dbd-oracle/branches/DBDOracle8/Oracle8.xsi (from r13712, /dbd-oracle/branches/DBDOracle8/Oracle.xsi)
==============================================================================
--- /dbd-oracle/branches/DBDOracle8/Oracle.xsi (original)
+++ dbd-oracle/branches/DBDOracle8/Oracle8.xsi Thu Jan 7 17:40:08 2010
@@ -9,7 +9,7 @@
#include "Driver_xst.h"
-MODULE = DBD::Oracle PACKAGE = DBD::Oracle
+MODULE = DBD::Oracle8 PACKAGE = DBD::Oracle8
REQUIRE: 1.929
PROTOTYPES: DISABLE
@@ -18,16 +18,16 @@
items = 0; /* avoid 'unused variable' warning */
DBISTATE_INIT;
/* XXX this interface will change: */
- DBI_IMP_SIZE("DBD::Oracle::dr::imp_data_size", sizeof(imp_drh_t));
- DBI_IMP_SIZE("DBD::Oracle::db::imp_data_size", sizeof(imp_dbh_t));
- DBI_IMP_SIZE("DBD::Oracle::st::imp_data_size", sizeof(imp_sth_t));
+ DBI_IMP_SIZE("DBD::Oracle8::dr::imp_data_size", sizeof(imp_drh_t));
+ DBI_IMP_SIZE("DBD::Oracle8::db::imp_data_size", sizeof(imp_dbh_t));
+ DBI_IMP_SIZE("DBD::Oracle8::st::imp_data_size", sizeof(imp_sth_t));
dbd_init(DBIS);
# ------------------------------------------------------------
# driver level interface
# ------------------------------------------------------------
-MODULE = DBD::Oracle PACKAGE = DBD::Oracle::dr
+MODULE = DBD::Oracle8 PACKAGE = DBD::Oracle8::dr
#ifdef dbd_discon_all
@@ -72,7 +72,7 @@
# ------------------------------------------------------------
# database level interface
# ------------------------------------------------------------
-MODULE = DBD::Oracle PACKAGE = DBD::Oracle::db
+MODULE = DBD::Oracle8 PACKAGE = DBD::Oracle8::db
void
@@ -111,7 +111,7 @@
(DBD_ATTRIB_TRUE(attr,"Slice",5,tmp_svp) || DBD_ATTRIB_TRUE(attr,"Columns",7,tmp_svp))
) {
/* fallback to perl implementation */
- ST(0) = dbixst_bounce_method("DBD::Oracle::db::SUPER::selectall_arrayref", items);
+ ST(0) = dbixst_bounce_method("DBD::Oracle8::db::SUPER::selectall_arrayref", items);
XSRETURN(1);
}
}
@@ -367,7 +367,7 @@
CODE:
D_imp_xxh(h);
ST(0) = (dbd_take_imp_data(h, imp_xxh, NULL))
- ? dbixst_bounce_method("DBD::Oracle::db::SUPER::take_imp_data", items)
+ ? dbixst_bounce_method("DBD::Oracle8::db::SUPER::take_imp_data", items)
: &sv_undef;
#endif
@@ -394,12 +394,12 @@
#endif
-# -- end of DBD::Oracle::db
+# -- end of DBD::Oracle8::db
# ------------------------------------------------------------
# statement interface
# ------------------------------------------------------------
-MODULE = DBD::Oracle PACKAGE = DBD::Oracle::st
+MODULE = DBD::Oracle8 PACKAGE = DBD::Oracle8::st
void
@@ -612,7 +612,7 @@
SV * batch_row_count
CODE:
if (SvOK(slice)) { /* fallback to perl implementation */
- ST(0) = dbixst_bounce_method("DBD::Oracle::st::SUPER::fetchall_arrayref", 3);
+ ST(0) = dbixst_bounce_method("DBD::Oracle8::st::SUPER::fetchall_arrayref", 3);
}
else {
ST(0) = dbdxst_fetchall_arrayref(sth, slice, batch_row_count);
Modified: dbd-oracle/branches/DBDOracle8/dbdimp.obj
==============================================================================
Binary files. No diff available.
Modified: dbd-oracle/branches/DBDOracle8/mk.pm
==============================================================================
--- dbd-oracle/branches/DBDOracle8/mk.pm (original)
+++ dbd-oracle/branches/DBDOracle8/mk.pm Thu Jan 7 17:40:08 2010
@@ -1,6 +1,6 @@
$dbd_oracle_mm_opts = {
'NAME' => 'DBD::Oracle8',
- 'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/',
+ 'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:\\Perl\\site\\lib\\auto\\DBI',
'LIBS' => [
'-LD:/oracle/ora81/oci/LIB/MSVC OCI'
],
@@ -53,7 +53,7 @@
'INST_MAN1DIR' => 'blib\\man1',
'MAN3EXT' => '3',
'XS' => {
- 'Oracle.xs' => 'Oracle.c'
+ 'Oracle8.xs' => 'Oracle8.c'
},
'MAKE' => 'nmake',
'FULL_AR' => '',
@@ -94,6 +94,7 @@
'OBJ_EXT' => '.obj',
'C' => [
'Oracle.c',
+ 'Oracle8.c',
'dbdimp.c',
'oci8.c'
],
@@ -146,7 +147,7 @@
'# DEFINE => q[ -DUTF8_SUPPORT -DORA_OCI_VERSION=\\"8.1.7.0\\"]',
'# DIR => []',
'# EXE_FILES => [q[ora_explain]]',
- '# INC => q[-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/]',
+ '# INC => q[-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:\\Perl\\site\\lib\\auto\\DBI]',
'# LIBS => [q[-LD:/oracle/ora81/oci/LIB/MSVC OCI]]',
'# NAME => q[DBD::Oracle8]',
'# OBJECT => q[$(O_FILES)]',
@@ -162,7 +163,7 @@
'INSTALLMAN3DIR' => 'C:\\Perl\\man\\man3',
'PERLPREFIX' => 'C:\\Perl',
'AUTHOR' => 'Tim Bunce ([email protected] )',
- 'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/',
+ 'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:\\Perl\\site\\lib\\auto\\DBI',
'LDFLAGS' => '-nologo -nodefaultlib -debug -opt:ref,icf -libpath:"C:\\Perl\\lib\\CORE" -machine:x86',
'INSTALLVENDORHTMLDIR' => 'C:\\Perl\\html',
'dist' => $dbd_oracle_mm_opts->{'dist'},
@@ -201,6 +202,7 @@
'AR' => 'lib',
'O_FILES' => [
'Oracle.obj',
+ 'Oracle8.obj',
'dbdimp.obj',
'oci8.obj'
],
@@ -226,7 +228,7 @@
'MACROEND' => '',
'ARGS' => {
'NAME' => 'DBD::Oracle8',
- 'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/',
+ 'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:\\Perl\\site\\lib\\auto\\DBI',
'LIBS' => $dbd_oracle_mm_opts->{'LIBS'},
'AUTHOR' => 'Tim Bunce ([email protected] )',
'DIR' => $dbd_oracle_mm_opts->{'DIR'},
@@ -320,8 +322,8 @@
'PM' => {
'Oracle8.pm' => '$(INST_LIB)\\DBD\\Oracle8.pm',
'oraperl.ph' => '$(INST_LIB)/oraperl.ph',
+ 'lib/DBD/Oracle8/GetInfo.pm' => 'blib\\lib\\DBD\\Oracle8\\GetInfo.pm',
'Oraperl.pm' => '$(INST_LIB)/Oraperl.pm',
- 'lib/DBD/Oracle/GetInfo.pm' => 'blib\\lib\\DBD\\Oracle\\GetInfo.pm',
'mk.pm' => '$(INST_LIB)\\DBD\\mk.pm'
},
'ABSPERLRUNINST' => '$(ABSPERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"',
Modified: dbd-oracle/branches/DBDOracle8/oci8.obj
==============================================================================
Binary files. No diff available.
Modified: dbd-oracle/branches/DBDOracle8/t/01base.t
==============================================================================
--- dbd-oracle/branches/DBDOracle8/t/01base.t (original)
+++ dbd-oracle/branches/DBDOracle8/t/01base.t Thu Jan 7 17:40:08 2010
@@ -16,7 +16,7 @@
eval {
# This is a special case. install_driver should not normally be used.
-$drh = DBI->install_driver('Oracle');
+$drh = DBI->install_driver('Oracle8');
(ref $drh eq 'DBI::dr') ? print "ok 4\n" : print "not ok 4\n";
};
Modified: dbd-oracle/branches/DBDOracle8/t/nchar_test_lib.pl
==============================================================================
--- dbd-oracle/branches/DBDOracle8/t/nchar_test_lib.pl (original)
+++ dbd-oracle/branches/DBDOracle8/t/nchar_test_lib.pl Thu Jan 7 17:40:08 2010
@@ -143,7 +143,7 @@
sub oracle_test_dsn
{
- my( $default, $dsn ) = ( 'dbi:Oracle:', $ENV{ORACLE_DSN} );
+ my( $default, $dsn ) = ( 'dbi:Oracle8:', $ENV{ORACLE_DSN} );
$dsn ||= $ENV{DBI_DSN} if $ENV{DBI_DSN} && ($ENV{DBI_DSN} =~ /^$default/io);
$dsn ||= $default;
return $dsn;
Modified: dbd-oracle/branches/DBDOracle8/vc70.pdb
==============================================================================
Binary files. No diff available.