$ENV{NLS_LANG} = "AMERICAN";
my $v = do {
- my $v = DBICTest::Schema->connect($dsn, $user, $pass)->storage->_dbh_get_info(18);
- $v =~ /^(\d+)\.(\d+)/
- or die "Unparseable Oracle server version: $v\n";
-
- sprintf('%d.%03d', $1, $2);
+ my $si = DBICTest::Schema->connect($dsn, $user, $pass)->storage->_server_info;
+ $si->{normalized_dbms_version}
+ or die "Unparseable Oracle server version: $si->{dbms_version}\n";
};
+
##########
# the recyclebin (new for 10g) sometimes comes in the way
my $on_connect_sql = $v >= 10 ? ["ALTER SESSION SET recyclebin = OFF"] : [];
sub _run_blob_tests {
SKIP: {
-TODO: {
my ($schema, $opt) = @_;
my %binstr = ( 'small' => join('', map { chr($_) } ( 1 .. 127 )) );
$binstr{'large'} = $binstr{'small'} x 1024;
ok (try { $objs[0]->blob }||'' eq "blob:$str", 'blob inserted/retrieved correctly');
ok (try { $objs[0]->clob }||'' eq "clob:$str", 'clob inserted/retrieved correctly');
- TODO: {
+ {
local $TODO = '-like comparison on blobs not tested before ora 10 (fails on 8i)'
if $schema->storage->_server_info->{normalized_dbms_version} < 10;
}
$schema->storage->debug ($orig_debug);
-}}
+}
do_clean ($dbh);
}
}
END {
- for ($dbh) {
- next unless $_;
+ if ($dbh) {
local $SIG{__WARN__} = sub {};
- do_clean($_);
- $_->disconnect;
+ do_clean($dbh);
+ undef $dbh;
}
}