[svn:dbd-oracle] r14935 - in dbd-oracle/trunk: . Oracle.ex README-files/hpux examples t xt
[email protected] Thu, 15 Sep 2011 11:50:34 -0700 (PDT)
| Newsgroups | perl.dbd.oracle.changes |
|---|---|
| Message-ID | <[email protected]> |
Author: yanick
Date: Thu Sep 15 11:50:33 2011
New Revision: 14935
Added:
dbd-oracle/trunk/examples/
dbd-oracle/trunk/examples/README
- copied, changed from r14930, /dbd-oracle/trunk/Oracle.ex/README
dbd-oracle/trunk/examples/bind.pl
- copied, changed from r14930, /dbd-oracle/trunk/Oracle.ex/bind.pl
dbd-oracle/trunk/examples/commit.pl
- copied, changed from r14930, /dbd-oracle/trunk/Oracle.ex/commit.pl
dbd-oracle/trunk/examples/curref.pl
- copied, changed from r14930, /dbd-oracle/trunk/Oracle.ex/curref.pl
dbd-oracle/trunk/examples/ex.pl
- copied, changed from r14930, /dbd-oracle/trunk/Oracle.ex/ex.pl
dbd-oracle/trunk/examples/japh
- copied, changed from r14930, /dbd-oracle/trunk/Oracle.ex/japh
dbd-oracle/trunk/examples/mktable.pl
- copied, changed from r14930, /dbd-oracle/trunk/Oracle.ex/mktable.pl
dbd-oracle/trunk/examples/ora_explain.pl
- copied, changed from r14930, /dbd-oracle/trunk/ora_explain.PL
dbd-oracle/trunk/examples/oradump.pl
- copied, changed from r14930, /dbd-oracle/trunk/Oracle.ex/oradump.pl
dbd-oracle/trunk/examples/proc.pl
- copied, changed from r14930, /dbd-oracle/trunk/Oracle.ex/proc.pl
dbd-oracle/trunk/examples/sql
- copied, changed from r14930, /dbd-oracle/trunk/Oracle.ex/sql
dbd-oracle/trunk/examples/tabinfo.pl
- copied, changed from r14930, /dbd-oracle/trunk/Oracle.ex/tabinfo.pl
dbd-oracle/trunk/xt/manifest.t
Removed:
dbd-oracle/trunk/Oracle.ex/README
dbd-oracle/trunk/Oracle.ex/bind.pl
dbd-oracle/trunk/Oracle.ex/commit.pl
dbd-oracle/trunk/Oracle.ex/curref.pl
dbd-oracle/trunk/Oracle.ex/ex.pl
dbd-oracle/trunk/Oracle.ex/japh
dbd-oracle/trunk/Oracle.ex/mktable.pl
dbd-oracle/trunk/Oracle.ex/oradump.pl
dbd-oracle/trunk/Oracle.ex/proc.pl
dbd-oracle/trunk/Oracle.ex/sql
dbd-oracle/trunk/Oracle.ex/tabinfo.pl
dbd-oracle/trunk/README-files/hpux/Conf-Lincoln-1.06
dbd-oracle/trunk/README-files/hpux/Conf-Lincoln-1.07
dbd-oracle/trunk/README-files/hpux/Conf-Merijn-580-10.20-cc
dbd-oracle/trunk/README-files/hpux/Conf-Merijn-585-11.00-cc
dbd-oracle/trunk/README-files/hpux/Conf-Merijn-585-11.11-cc
dbd-oracle/trunk/README-files/hpux/Conf-Merijn-587-11.23-cc
dbd-oracle/trunk/README-files/hpux/Conf-Merijn-588-10.20-gcc
dbd-oracle/trunk/README-files/hpux/Conf-Merijn-588-11.00-gcc32
dbd-oracle/trunk/README-files/hpux/Conf-Merijn-588-11.00-gcc64
dbd-oracle/trunk/README-files/hpux/Conf-Merijn-588-11.11-gcc32
dbd-oracle/trunk/README-files/hpux/Conf-Merijn-588-11.11-gcc64
dbd-oracle/trunk/README-files/hpux/Conf-Merijn-588-11.23-gcc64
dbd-oracle/trunk/README-files/hpux/Conf-Mike
dbd-oracle/trunk/README-files/hpux/Conf-Roger
dbd-oracle/trunk/README-files/hpux/libjava.eml
dbd-oracle/trunk/README.explain.txt
dbd-oracle/trunk/ora_explain.PL
Modified:
dbd-oracle/trunk/Changes
dbd-oracle/trunk/MANIFEST
dbd-oracle/trunk/MANIFEST.SKIP
dbd-oracle/trunk/Makefile.PL
dbd-oracle/trunk/Oraperl.pm
dbd-oracle/trunk/t/21nchar.t
dbd-oracle/trunk/t/30long.t
dbd-oracle/trunk/t/40ph_type.t
dbd-oracle/trunk/t/50cursor.t
dbd-oracle/trunk/t/70meta.t
dbd-oracle/trunk/t/nchar_test_lib.pl
Log:
Merge branch 'master' into HEAD
Conflicts:
Changes
Modified: dbd-oracle/trunk/Changes
==============================================================================
--- dbd-oracle/trunk/Changes (original)
+++ dbd-oracle/trunk/Changes Thu Sep 15 11:50:33 2011
@@ -3,6 +3,7 @@
Changes in DBD-Oracle XXX
[ENHANCEMENTS]
- Makefile.PL's options are now documented
+ - move 'explain' to '/examples' directory
[BUG FIXES]
- support development release versions in GetInfo (Martin J. Evans)
@@ -12,6 +13,9 @@
- convert a symbolically linked ORACLE_HOME to an absolute path
(patch by H.Merijn Brand, applied by Martin J. Evans) [rt70785]
+ [DOCUMENTATION]
+ - announce that Oraperl will be removed from the dist by v1.38.
+
Changes in DBD-Oracle 1.30
[DOCUMENTATION]
- add warning about RT#69350 in documentation
Modified: dbd-oracle/trunk/MANIFEST
==============================================================================
--- dbd-oracle/trunk/MANIFEST (original)
+++ dbd-oracle/trunk/MANIFEST Thu Sep 15 11:50:33 2011
@@ -15,39 +15,23 @@
oci.def OCI.DLL export declarations
oci8.c
ocitrace.h
-ora_explain.PL
-Oracle.ex/bind.pl
-Oracle.ex/commit.pl
-Oracle.ex/curref.pl
-Oracle.ex/ex.pl
-Oracle.ex/japh
-Oracle.ex/mktable.pl
-Oracle.ex/oradump.pl
-Oracle.ex/proc.pl
-Oracle.ex/README
-Oracle.ex/sql
-Oracle.ex/tabinfo.pl
+examples/bind.pl
+examples/commit.pl
+examples/curref.pl
+examples/ex.pl
+examples/japh
+examples/mktable.pl
+examples/oradump.pl
+examples/proc.pl
+examples/README
+examples/sql
+examples/tabinfo.pl
Oracle.h
Oracle.pm
Oracle.xs
oraperl.ph Old oraperl file included for completeness of emulation
Oraperl.pm
README
-README-files/hpux/Conf-Lincoln-1.06
-README-files/hpux/Conf-Lincoln-1.07
-README-files/hpux/Conf-Merijn-580-10.20-cc
-README-files/hpux/Conf-Merijn-585-11.00-cc
-README-files/hpux/Conf-Merijn-585-11.11-cc
-README-files/hpux/Conf-Merijn-587-11.23-cc
-README-files/hpux/Conf-Merijn-588-10.20-gcc
-README-files/hpux/Conf-Merijn-588-11.00-gcc32
-README-files/hpux/Conf-Merijn-588-11.00-gcc64
-README-files/hpux/Conf-Merijn-588-11.11-gcc32
-README-files/hpux/Conf-Merijn-588-11.11-gcc64
-README-files/hpux/Conf-Merijn-588-11.23-gcc64
-README-files/hpux/Conf-Mike
-README-files/hpux/Conf-Roger
-README-files/hpux/libjava.eml
README-files/hpux/Makefile-Lincoln
README.64bit.txt
README.aix.txt
@@ -102,3 +86,5 @@
test.pl
Todo
typemap
+examples/ora_explain.pl
+t/00versions.t
Modified: dbd-oracle/trunk/MANIFEST.SKIP
==============================================================================
--- dbd-oracle/trunk/MANIFEST.SKIP (original)
+++ dbd-oracle/trunk/MANIFEST.SKIP Thu Sep 15 11:50:33 2011
@@ -15,3 +15,5 @@
^oracle/
^tags$
~$
+^\.git
+^xt
Modified: dbd-oracle/trunk/Makefile.PL
==============================================================================
--- dbd-oracle/trunk/Makefile.PL (original)
+++ dbd-oracle/trunk/Makefile.PL Thu Sep 15 11:50:33 2011
@@ -49,11 +49,10 @@
VERSION_FROM => 'Oracle.pm',
PREREQ_PM => { "Test::Simple" => 0.90, # actually Test::More pkg in T::S dist
"DBI" => 1.51},
- EXE_FILES => [ "ora_explain$exe_ext" ],
OBJECT => '$(O_FILES)',
DEFINE => '',
DIR => [],
- clean => { FILES => 'xstmp.c Oracle.xsi dll.base dll.exp sqlnet.log libOracle.def ora_explain mk.pm DBD_ORA_OBJ.*' },
+ clean => { FILES => 'xstmp.c Oracle.xsi dll.base dll.exp sqlnet.log libOracle.def mk.pm DBD_ORA_OBJ.*' },
dist => {
DIST_DEFAULT => 'clean distcheck disttest tardist',
PREOP => '$(MAKE) -f Makefile.old distdir',
Modified: dbd-oracle/trunk/Oraperl.pm
==============================================================================
--- dbd-oracle/trunk/Oraperl.pm (original)
+++ dbd-oracle/trunk/Oraperl.pm Thu Sep 15 11:50:33 2011
@@ -229,7 +229,7 @@
=head1 NAME
-Oraperl - deprecated (Repreived for now, but Will be removed in a future release) Perl access to Oracle databases for old oraperl scripts
+Oraperl - [DEPRECATED] Perl access to Oracle databases for old oraperl scripts
=head1 SYNOPSIS
@@ -292,6 +292,11 @@
eval 'use Oraperl; 1;' || die $@ if $] >= 5;
+
+The use of I<Oraperl> is deprecated in favor of L<DBD::Oracle>,
+and will be removed from the I<DBD::Oracle> distribution as of
+1.38.
+
=head2 Principal Functions
The main functions for database access are &ora_login(), &ora_open(),
Copied: dbd-oracle/trunk/examples/README (from r14930, /dbd-oracle/trunk/Oracle.ex/README)
==============================================================================
Copied: dbd-oracle/trunk/examples/bind.pl (from r14930, /dbd-oracle/trunk/Oracle.ex/bind.pl)
==============================================================================
Copied: dbd-oracle/trunk/examples/commit.pl (from r14930, /dbd-oracle/trunk/Oracle.ex/commit.pl)
==============================================================================
Copied: dbd-oracle/trunk/examples/curref.pl (from r14930, /dbd-oracle/trunk/Oracle.ex/curref.pl)
==============================================================================
Copied: dbd-oracle/trunk/examples/ex.pl (from r14930, /dbd-oracle/trunk/Oracle.ex/ex.pl)
==============================================================================
Copied: dbd-oracle/trunk/examples/japh (from r14930, /dbd-oracle/trunk/Oracle.ex/japh)
==============================================================================
Copied: dbd-oracle/trunk/examples/mktable.pl (from r14930, /dbd-oracle/trunk/Oracle.ex/mktable.pl)
==============================================================================
Copied: dbd-oracle/trunk/examples/ora_explain.pl (from r14930, /dbd-oracle/trunk/ora_explain.PL)
==============================================================================
--- /dbd-oracle/trunk/ora_explain.PL (original)
+++ dbd-oracle/trunk/examples/ora_explain.pl Thu Sep 15 11:50:33 2011
@@ -1,9 +1,4 @@
-# -*- perl -*-
-
-use strict;
-
-my $script = <<'SCRIPT';
-~startperl~ -w
+#!/usr/bin/env perl
################################################################################
# Copyright (c) 1999 Alan Burlison
@@ -22,6 +17,8 @@
################################################################################
use strict;
+use warnings;
+
use File::Basename;
use DBI;
use Tk;
@@ -1417,7 +1414,7 @@
-columnspan => 2, -padx => 6, -pady => 6);
$frame1->pack(-fill => "x");
&$ord_bn_cb(); # Set the buttons to the initial state
-$frame->pack(-fill => "x", ipadx => 6, -ipady => 6);
+$frame->pack(-fill => "x", -padx => 6, -pady => 6);
### Buttons
$frame = $GrabMain->Frame(-borderwidth => 3, -relief => "raised");
@@ -1573,14 +1570,11 @@
=head1 NAME
-explain, ora_explain - deprecated (Will be removed from DBD::Oracle in 1.29) Visualise Oracle query plans
+ora_explain.pl - Visualise Oracle query plans
=head1 SYNOPSIS
- $ explain [ [ user/password@database ] sql script ]
- $ ora_explain [ [ user/password@database ] sql script ]
-
-B<Note:> When bundled with DBD::Oracle, the script is called ora_explain
+ $ ora_explain.pl [ [ user/password@database ] sql script ]
=head1 DESCRIPTION
@@ -1632,29 +1626,9 @@
Items 2 through 6 can be obtained from any CPAN mirror.
-=head1 INSTALLATION
-
-=over 2
-
-=item 1.
-
-Check you have all the prequisites installed and working.
-
-=item 2.
-
-Run 'perl Makefile.PL; make instal1'
-
-=item 3.
-
-Make sure you have run the script $ORACLE_HOME/rdbms/admin/utlxplan.sql
-from a SQL*Plus session. This script creates the PLAN_TABLE that is used
-by Oracle when explaining query plans.
-
-=back
-
=head1 HOW TO USE
-Type "explain" or "ora_explain" at the shell prompt. A window will appear with
+Type "ora_explain.pl" at the shell prompt. A window will appear with
a menu bar and three frames, labelled "Query Plan", "Query Step Details" and
"SQL Editor". At the bottom of the window are three buttons labelled
"Explain", "Clear" and "SQL Cache". A login dialog will also appear, into
@@ -1789,18 +1763,3 @@
endorsed or warrantied by Sun Microsystems.
=cut
-SCRIPT
-
-use Config;
-
-my $file = __FILE__; $file =~ s/\.PL$//;
-
-$script =~ s/\~(\w+)\~/$Config{$1}/eg;
-if (!(open(FILE, ">$file")) ||
- !(print FILE $script) ||
- !(close(FILE))) {
- die "Error while writing $file: $!\n";
-}
-print "Extracted $file from ",__FILE__," with variable substitutions.\n";
-
-# End.
Copied: dbd-oracle/trunk/examples/oradump.pl (from r14930, /dbd-oracle/trunk/Oracle.ex/oradump.pl)
==============================================================================
Copied: dbd-oracle/trunk/examples/proc.pl (from r14930, /dbd-oracle/trunk/Oracle.ex/proc.pl)
==============================================================================
Copied: dbd-oracle/trunk/examples/sql (from r14930, /dbd-oracle/trunk/Oracle.ex/sql)
==============================================================================
Copied: dbd-oracle/trunk/examples/tabinfo.pl (from r14930, /dbd-oracle/trunk/Oracle.ex/tabinfo.pl)
==============================================================================
Modified: dbd-oracle/trunk/t/21nchar.t
==============================================================================
--- dbd-oracle/trunk/t/21nchar.t (original)
+++ dbd-oracle/trunk/t/21nchar.t Thu Sep 15 11:50:33 2011
@@ -20,8 +20,8 @@
# $dbh->{PrintError} = 1;
plan skip_all => "Unable to connect to Oracle" if not $dbh;
- diag("testing control and 8 bit chars:\n") ;
- diag(" Database and client versions and character sets:\n");
+ note("testing control and 8 bit chars:\n") ;
+ note(" Database and client versions and character sets:\n");
show_db_charsets( $dbh);
plan skip_all => "Oracle charset tests unreliable for Oracle 8 client"
Modified: dbd-oracle/trunk/t/30long.t
==============================================================================
--- dbd-oracle/trunk/t/30long.t (original)
+++ dbd-oracle/trunk/t/30long.t Thu Sep 15 11:50:33 2011
@@ -56,13 +56,13 @@
}
my $ora_server_version = $dbh->func("ora_server_version");
-diag("ora_server_version: @$ora_server_version\n");
+note("ora_server_version: @$ora_server_version\n");
show_db_charsets($dbh) if $dbh;
foreach (@test_sets) {
my ($type_name, $type_num, $test_no_type) = @$_;
$use_utf8_data = use_utf8_data($dbh,$type_name);
- diag( qq(
+ note( qq(
=========================================================================
Running long test for $type_name ($type_num) use_utf8_data=$use_utf8_data
));
@@ -111,7 +111,7 @@
my $utf_x = "0\x{263A}xyX"; #lab: the ubiquitous smiley face
$long_data[0] = ($utf_x x 2048) x (1 ); # 10KB < 64KB
if (length($long_data[0]) > 10240) {
- diag "known bug in perl5.6.0 utf8 support, applying workaround\n";
+ note "known bug in perl5.6.0 utf8 support, applying workaround\n";
my $utf_z = "0\x{263A}xyZ" ;
$long_data[0] = $utf_z;
$long_data[0] .= $utf_z foreach (1..2047);
@@ -151,11 +151,11 @@
if (!create_table($dbh, $tdata, 1));
# typically OCI 8 client talking to Oracle 7 database
- diag("long_data[0] length $len_data0\n");
- diag("long_data[1] length $len_data1\n");
- diag("long_data[2] length $len_data2\n");
+ note("long_data[0] length $len_data0\n");
+ note("long_data[1] length $len_data1\n");
+ note("long_data[2] length $len_data2\n");
- diag(" --- insert some $type_name data (ora_type $type_num)\n");
+ note(" --- insert some $type_name data (ora_type $type_num)\n");
my $sqlstr = "insert into $table values (?, ?, SYSDATE)" ;
ok( $sth = $dbh->prepare( $sqlstr ), "prepare: $sqlstr" );
my $bind_attr = { ora_type => $type_num };
@@ -172,10 +172,10 @@
array_test($dbh);
- diag(" --- fetch $type_name data back again -- truncated - LongTruncOk == 1\n");
+ note(" --- fetch $type_name data back again -- truncated - LongTruncOk == 1\n");
$dbh->{LongReadLen} = 20;
$dbh->{LongTruncOk} = 1;
- diag("LongReadLen $dbh->{LongReadLen}, LongTruncOk $dbh->{LongTruncOk}\n");
+ note("LongReadLen $dbh->{LongReadLen}, LongTruncOk $dbh->{LongTruncOk}\n");
# This behaviour isn't specified anywhere, sigh:
my $out_len = $dbh->{LongReadLen};
@@ -212,12 +212,12 @@
ok(!defined $tmp->[3][1], "last row undefined"); # NULL # known bug in DBD::Oracle <= 1.13
}
- diag(" --- fetch $type_name data back again -- truncated - LongTruncOk == 0\n");
+ note(" --- fetch $type_name data back again -- truncated - LongTruncOk == 0\n");
$dbh->{LongReadLen} = $len_data1 - 10; # so $long_data[0] fits but long_data[1] doesn't
$dbh->{LongReadLen} = $dbh->{LongReadLen} / 2 if $type_name =~ /RAW/i;
my $LongReadLen = $dbh->{LongReadLen};
$dbh->{LongTruncOk} = 0;
- diag("LongReadLen $dbh->{LongReadLen}, LongTruncOk $dbh->{LongTruncOk}\n");
+ note("LongReadLen $dbh->{LongReadLen}, LongTruncOk $dbh->{LongTruncOk}\n");
$sqlstr = "select * from $table order by idx";
ok($sth = $dbh->prepare($sqlstr), "prepare $sqlstr" );
@@ -235,10 +235,10 @@
}
$sth->finish;
- diag(" --- fetch $type_name data back again -- complete - LongTruncOk == 0\n");
+ note(" --- fetch $type_name data back again -- complete - LongTruncOk == 0\n");
$dbh->{LongReadLen} = $len_data1 +1000;
$dbh->{LongTruncOk} = 0;
- diag("LongReadLen $dbh->{LongReadLen}, LongTruncOk $dbh->{LongTruncOk}\n");
+ note("LongReadLen $dbh->{LongReadLen}, LongTruncOk $dbh->{LongTruncOk}\n");
$sqlstr = "select * from $table order by idx";
ok($sth = $dbh->prepare($sqlstr), "prepare: $sqlstr" );
@@ -257,7 +257,7 @@
if ($type_name =~ /LONG/i) ;
#$dbh->trace(4);
- diag(" --- fetch $type_name data back again -- via blob_read\n\n");
+ note(" --- fetch $type_name data back again -- via blob_read\n\n");
$dbh->{LongReadLen} = 1024 * 90;
$dbh->{LongTruncOk} = 1;
@@ -266,11 +266,11 @@
ok($sth->execute, "execute $sqlstr" );
- diag("fetch via fetchrow_arrayref\n");
+ note("fetch via fetchrow_arrayref\n");
ok($tmp = $sth->fetchrow_arrayref, "fetchrow_arrayref 1: $sqlstr" );
cmp_ok_byte_nice($tmp->[1], $long_data[0], "truncated to LongReadLen $out_len");
- diag("read via blob_read_all\n");
+ note("read via blob_read_all\n");
cmp_ok(blob_read_all($sth, 1, \$p1, 4096) ,'==', length($long_data[0]),
"blob_read_all = length(\$long_data[0])" );
ok($p1 eq $long_data[0], cdif($p1, $long_data[0]) );
@@ -289,7 +289,7 @@
cmp_ok($len,'==', length($long_data[2]), "length of long_data[2] = $len" );
cmp_ok_byte_nice($p1, $long_data[2], "3rd row via blob_read_all");
- diag("result is ".(utf8::is_utf8($p1) ? "UTF8" : "non-UTF8")."\n");
+ note("result is ".(utf8::is_utf8($p1) ? "UTF8" : "non-UTF8")."\n");
if ($be_utf8) {
ok( utf8::is_utf8($p1), "result should be utf8");
}
@@ -303,7 +303,7 @@
skip( "ora_auto_lob tests for $type_name" ."s - not supported", 7+(13*3) )
if not ( $type_name =~ /LOB/i );
- diag(" --- testing ora_auto_lob to access $type_name LobLocator\n\n");
+ note(" --- testing ora_auto_lob to access $type_name LobLocator\n\n");
my $data_fmt = "%03d foo!";
$sqlstr = qq{
@@ -315,7 +315,7 @@
ok($ll_sth->execute ,"execute $sqlstr" );
while (my ($lob_locator, $idx) = $ll_sth->fetchrow_array) {
- diag("$idx: ".DBI::neat($lob_locator)."\n");
+ note("$idx: ".DBI::neat($lob_locator)."\n");
last if !defined($lob_locator) && $idx == 43;
ok($lob_locator, '$lob_locator is true' );
@@ -327,22 +327,22 @@
ok(!$DBI::err, "DBI::errstr");
my $data = sprintf $data_fmt, $idx; #create a little data
- diag("length of data to be written at offset 1: " .length($data) ."\n" );
+ note("length of data to be written at offset 1: " .length($data) ."\n" );
ok($dbh->func($lob_locator, 1, $data, 'ora_lob_write') ,"ora_lob_write" );
}
is($ll_sth->rows, 4);
- diag(" --- round again to check contents after $type_name write updates...\n");
+ note(" --- round again to check contents after $type_name write updates...\n");
ok($ll_sth->execute,"execute (again 1) $sqlstr" );
while (my ($lob_locator, $idx) = $ll_sth->fetchrow_array) {
- diag("$idx locator: ".DBI::neat($lob_locator)."\n");
+ note("$idx locator: ".DBI::neat($lob_locator)."\n");
next if !defined($lob_locator) && $idx == 43;
diag("DBI::errstr=$DBI::errstr\n") if $DBI::err ;
my $content = $dbh->func($lob_locator, 1, 20, 'ora_lob_read');
diag("DBI::errstr=$DBI::errstr\n") if $DBI::err ;
ok($content,"content is true" );
- diag("$idx content: ".nice_string($content)."\n"); #.DBI::neat($content)."\n";
+ note("$idx content: ".nice_string($content)."\n"); #.DBI::neat($content)."\n";
cmp_ok(length($content) ,'==', 20 ,"lenth(content)" );
# but prefix has been overwritten:
@@ -374,10 +374,10 @@
} #while fetchrow
is($ll_sth->rows, 4);
- diag(" --- round again to check the $type_name length...\n");
+ note(" --- round again to check the $type_name length...\n");
ok($ll_sth->execute ,"execute (again 2) $sqlstr" );
while (my ($lob_locator, $idx) = $ll_sth->fetchrow_array) {
- diag("$idx locator: ".DBI::neat($lob_locator)."\n");
+ note("$idx locator: ".DBI::neat($lob_locator)."\n");
next if !defined($lob_locator) && $idx == 43;
my $len = $dbh->func($lob_locator, 'ora_lob_length');
#lab: possible logic error here w/resp. to len
@@ -410,8 +410,8 @@
$a = [];
$sth->bind_param_inout(1,\$a, 2);
$sth->execute;
- diag("a=$a\n");
- diag("a=@$a\n");
+ note("a=$a\n");
+ note("a=@$a\n");
};
die "RETURNING array: $@";
}
Modified: dbd-oracle/trunk/t/40ph_type.t
==============================================================================
--- dbd-oracle/trunk/t/40ph_type.t (original)
+++ dbd-oracle/trunk/t/40ph_type.t Thu Sep 15 11:50:33 2011
@@ -69,9 +69,7 @@
my $ph_type = $test_info->{type} || die;
my $name = $test_info->{name} || die;
- diag("\n");
- diag("testing @{[ %$test_info ]} ...\n");
- diag("\n");
+ note("\ntesting @{[ %$test_info ]} ...\n\n");
SKIP: {
skip "skipping tests", 12 if ($test_info->{SKIP});
@@ -95,7 +93,7 @@
$dbh->rollback;
delete $_->{name} foreach values %$tmp;
- diag(Data::Dumper::Dumper($tmp));
+ note(Data::Dumper::Dumper($tmp));
# check trailing_space behaviour
my $expect = $val_with_trailing_space;
Modified: dbd-oracle/trunk/t/50cursor.t
==============================================================================
--- dbd-oracle/trunk/t/50cursor.t (original)
+++ dbd-oracle/trunk/t/50cursor.t Thu Sep 15 11:50:33 2011
@@ -49,7 +49,7 @@
my @cursors;
my @row;
-diag("opening cursors\n");
+note("opening cursors\n");
my $open_cursor = $dbh->prepare( qq{
BEGIN OPEN :kursor FOR
SELECT * FROM all_objects WHERE rownum < 5;
@@ -58,7 +58,7 @@
ok($open_cursor, 'open cursor' );
foreach ( 1 .. $limit ) {
- diag("opening cursor $_\n");
+ note("opening cursor $_\n");
ok( $open_cursor->bind_param_inout( ":kursor", \my $cursor, 0, { ora_type => ORA_RSET } ), 'open cursor bind param inout' );
ok( $open_cursor->execute, 'open cursor execute' );
ok(!$open_cursor->{Active}, 'open cursor Active');
@@ -72,7 +72,7 @@
push @cursors, $cursor;
}
-diag("closing cursors\n");
+note("closing cursors\n");
my $close_cursor = $dbh->prepare( qq{ BEGIN CLOSE :kursor; END; } );
ok($close_cursor, 'close cursor');
foreach ( 1 .. @cursors ) {
Modified: dbd-oracle/trunk/t/70meta.t
==============================================================================
--- dbd-oracle/trunk/t/70meta.t (original)
+++ dbd-oracle/trunk/t/70meta.t Thu Sep 15 11:50:33 2011
@@ -20,14 +20,14 @@
plan skip_all => "Unable to connect to Oracle";
}
-diag("type_info_all\n");
+note("type_info_all\n");
my @types = $dbh->type_info(SQL_ALL_TYPES);
ok(@types >= 8, 'more than 8 types');
-diag(Dumper( @types ));
+note(Dumper( @types ));
-diag("tables():\n");
+note("tables():\n");
my @tables = $dbh->tables;
-diag(@tables." tables\n");
+note(@tables." tables\n");
ok(scalar @tables, 'tables');
my @table_info_params = (
Modified: dbd-oracle/trunk/t/nchar_test_lib.pl
==============================================================================
--- dbd-oracle/trunk/t/nchar_test_lib.pl (original)
+++ dbd-oracle/trunk/t/nchar_test_lib.pl Thu Sep 15 11:50:33 2011
@@ -189,7 +189,7 @@
my $nice_string = nice_string($v);
my $out = sprintf( "row: %3d: nice_string=%s byte_string=%s (%s, %s)\n",
$cnt, $nice_string, $byte_string, $v, DBI::neat($v));
- diag($out);
+ note($out);
}
return $cnt;
}
@@ -387,7 +387,7 @@
} else {
#$sql =~ s/ \( */(\n\t/g;
#$sql =~ s/, */,\n\t/g;
- diag("$sql\n") ;
+ note("$sql\n") ;
}
return $table;
# ok( not $dbh->err, "create table $table..." );
@@ -406,11 +406,11 @@
db_ochar_is_utf($dbh) ? "Unicode" : "Non-Unicode",
$paramsH->{NLS_NCHAR_CHARACTERSET},
db_nchar_is_utf($dbh) ? "Unicode" : "Non-Unicode";
- diag($out);
+ note($out);
my $ora_client_version = ORA_OCI();
$out = sprintf "Client $ora_client_version NLS_LANG is '%s', NLS_NCHAR is '%s'\n",
ora_env_var("NLS_LANG") || "<unset>", ora_env_var("NLS_NCHAR") || "<unset>";
- diag($out);
+ note($out);
}
sub db_ochar_is_utf { return shift->ora_can_unicode & 2 }
sub db_nchar_is_utf { return shift->ora_can_unicode & 1 }
Added: dbd-oracle/trunk/xt/manifest.t
==============================================================================
--- (empty file)
+++ dbd-oracle/trunk/xt/manifest.t Thu Sep 15 11:50:33 2011
@@ -0,0 +1,21 @@
+use strict;
+use warnings;
+
+use ExtUtils::Manifest qw/ fullcheck /;
+
+use Test::More tests => 1;
+
+my ( $missing, $extra ) = do {
+ local *STDERR;
+
+ # hush little baby, don't you cry
+ open STDERR, '>', \my $stderr;
+
+ fullcheck();
+};
+
+ok @$missing + @$extra == 0, 'manifest in sync' or do {
+ diag "missing files:\n", map { " \t $_\n " } @$missing if @$missing;
+ diag "extra files: \n", map { "\t$_\n" } @$extra if @$extra;
+};
+