X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F746sybase.t;h=cb6849a16018d5b412e63874359763f68d144d88;hb=4ca1fd6fb90a85f5138d11f580394025aa20ea4a;hp=295b76a08b303b6177372112db8c0726294ca069;hpb=db66bc3fc496ef6bca038c0e42fc46030991fef3;p=dbsrgits%2FDBIx-Class.git diff --git a/t/746sybase.t b/t/746sybase.t index 295b76a..cb6849a 100644 --- a/t/746sybase.t +++ b/t/746sybase.t @@ -1,32 +1,31 @@ use strict; -use warnings; +use warnings; no warnings 'uninitialized'; use Test::More; use Test::Exception; +use DBIx::Class::Optional::Dependencies (); use lib qw(t/lib); use DBICTest; -require DBIx::Class::Storage::DBI::Sybase; -require DBIx::Class::Storage::DBI::Sybase::NoBindVars; - my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_SYBASE_${_}" } qw/DSN USER PASS/}; - -my $TESTS = 63 + 2; - if (not ($dsn && $user)) { - plan skip_all => - 'Set $ENV{DBICTEST_SYBASE_DSN}, _USER and _PASS to run this test' . - "\nWarning: This test drops and creates the tables " . - "'artist', 'money_test' and 'bindtype_test'"; -} else { - plan tests => $TESTS*2 + 1; -} + plan skip_all => join ' ', + 'Set $ENV{DBICTEST_SYBASE_DSN}, _USER and _PASS to run this test.', + 'Warning: This test drops and creates the tables:', + "'artist', 'money_test' and 'bindtype_test'", + ; +}; + +plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('test_rdbms_ase') + unless DBIx::Class::Optional::Dependencies->req_ok_for ('test_rdbms_ase'); my @storage_types = ( - 'DBI::Sybase', - 'DBI::Sybase::NoBindVars', + 'DBI::Sybase::ASE', + 'DBI::Sybase::ASE::NoBindVars', ); +eval "require DBIx::Class::Storage::$_;" for @storage_types; + my $schema; my $storage_idx = -1; @@ -40,8 +39,8 @@ sub get_schema { my $ping_count = 0; { - my $ping = DBIx::Class::Storage::DBI::Sybase->can('_ping'); - *DBIx::Class::Storage::DBI::Sybase::_ping = sub { + my $ping = DBIx::Class::Storage::DBI::Sybase::ASE->can('_ping'); + *DBIx::Class::Storage::DBI::Sybase::ASE::_ping = sub { $ping_count++; goto $ping; }; @@ -50,7 +49,7 @@ my $ping_count = 0; for my $storage_type (@storage_types) { $storage_idx++; - unless ($storage_type eq 'DBI::Sybase') { # autodetect + unless ($storage_type eq 'DBI::Sybase::ASE') { # autodetect DBICTest::Schema->storage_type("::$storage_type"); } @@ -59,10 +58,9 @@ for my $storage_type (@storage_types) { $schema->storage->ensure_connected; if ($storage_idx == 0 && - $schema->storage->isa('DBIx::Class::Storage::DBI::Sybase::NoBindVars')) { -# no placeholders in this version of Sybase or DBD::Sybase (or using FreeTDS) - my $tb = Test::More->builder; - $tb->skip('no placeholders') for 1..$TESTS; + $schema->storage->isa('DBIx::Class::Storage::DBI::Sybase::ASE::NoBindVars')) { + # no placeholders in this version of Sybase or DBD::Sybase (or using FreeTDS) + skip "Skipping entire test for $storage_type - no placeholder support", 1; next; } @@ -91,12 +89,13 @@ SQL # test primary key handling my $new = $schema->resultset('Artist')->create({ name => 'foo' }); + like $new->artistid, qr/^\d+\z/, 'Auto-PK returned a number'; ok($new->artistid > 0, "Auto-PK worked"); $seen_id{$new->artistid}++; # check redispatch to storage-specific insert when auto-detected storage - if ($storage_type eq 'DBI::Sybase') { + if ($storage_type eq 'DBI::Sybase::ASE') { DBICTest::Schema->storage_type('::DBI'); $schema = get_schema(); } @@ -337,7 +336,7 @@ SQL # mostly stolen from the blob stuff Nniuq wrote for t/73oracle.t SKIP: { skip 'TEXT/IMAGE support does not work with FreeTDS', 22 - if $schema->storage->using_freetds; + if $schema->storage->_using_freetds; my $dbh = $schema->storage->_dbh; { @@ -345,12 +344,13 @@ SQL eval { $dbh->do('DROP TABLE bindtype_test') }; $dbh->do(qq[ - CREATE TABLE bindtype_test + CREATE TABLE bindtype_test ( - id INT IDENTITY PRIMARY KEY, - bytea IMAGE NULL, - blob IMAGE NULL, - clob TEXT NULL + id INT IDENTITY PRIMARY KEY, + bytea IMAGE NULL, + blob IMAGE NULL, + clob TEXT NULL, + a_memo IMAGE NULL ) ],{ RaiseError => 1, PrintError => 0 }); } @@ -359,8 +359,8 @@ SQL $binstr{'large'} = $binstr{'small'} x 1024; my $maxloblen = length $binstr{'large'}; - - if (not $schema->storage->using_freetds) { + + if (not $schema->storage->_using_freetds) { $dbh->{'LongReadLen'} = $maxloblen * 2; } else { $dbh->do("set textsize ".($maxloblen * 2)); @@ -402,7 +402,7 @@ SQL my $new_str = $binstr{large} . 'mtfnpy'; # check redispatch to storage-specific update when auto-detected storage - if ($storage_type eq 'DBI::Sybase') { + if ($storage_type eq 'DBI::Sybase::ASE') { DBICTest::Schema->storage_type('::DBI'); $schema = get_schema(); } @@ -439,12 +439,10 @@ SQL lives_ok { $rs->populate([ { - bytea => 1, blob => $binstr{large}, clob => $new_str, }, { - bytea => 1, blob => $binstr{large}, clob => $new_str, }, @@ -472,12 +470,14 @@ SQL bytea => 1, blob => $binstr{large}, clob => $new_str, + a_memo => 2, }, { id => 2, bytea => 1, blob => $binstr{large}, clob => $new_str, + a_memo => 2, }, ]); } 'insert_bulk with blobs and explicit identity does NOT die'; @@ -533,7 +533,7 @@ SQL } # test insert in an outer transaction when there's an active cursor - TODO: { + { local $TODO = 'this should work once we have eager cursors'; # clear state, or we get a deadlock on $row->delete @@ -557,33 +557,87 @@ SQL $row = $rs->create({ amount => 100 }); } 'inserted a money value'; - is eval { $rs->find($row->id)->amount }, 100, 'money value round-trip'; + cmp_ok eval { $rs->find($row->id)->amount }, '==', 100, + 'money value round-trip'; lives_ok { $row->update({ amount => 200 }); } 'updated a money value'; - is eval { $rs->find($row->id)->amount }, - 200, 'updated money value round-trip'; + cmp_ok eval { $rs->find($row->id)->amount }, '==', 200, + 'updated money value round-trip'; lives_ok { $row->update({ amount => undef }); } 'updated a money value to NULL'; - my $null_amount = eval { $rs->find($row->id)->amount }; - ok( - (($null_amount == undef) && (not $@)), - 'updated money value to NULL round-trip' + lives_and { + my $null_amount = $rs->find($row->id)->amount; + is $null_amount, undef; + } 'updated money value to NULL round-trip'; + +# Test computed columns and timestamps + $schema->storage->dbh_do (sub { + my ($storage, $dbh) = @_; + eval { $dbh->do("DROP TABLE computed_column_test") }; + $dbh->do(<<'SQL'); +CREATE TABLE computed_column_test ( + id INT IDENTITY PRIMARY KEY, + a_computed_column AS getdate(), + a_timestamp timestamp, + charfield VARCHAR(20) DEFAULT 'foo' +) +SQL + }); + + require DBICTest::Schema::ComputedColumn; + $schema->register_class( + ComputedColumn => 'DBICTest::Schema::ComputedColumn' ); - diag $@ if $@; + + ok (($rs = $schema->resultset('ComputedColumn')), + 'got rs for ComputedColumn'); + + lives_ok { $row = $rs->create({}) } + 'empty insert for a table with computed columns survived'; + + lives_ok { + $row->update({ charfield => 'bar' }) + } 'update of a table with computed columns survived'; } is $ping_count, 0, 'no pings'; +# if tests passed and did so under a non-C lang - let's rerun the test +if (Test::Builder->new->is_passing and $ENV{LANG} and $ENV{LANG} ne 'C') { + my $oldlang = $ENV{LANG}; + local $ENV{LANG} = 'C'; + + pass ("Your lang is set to $oldlang - retesting with C"); + + local $ENV{PATH}; + my @cmd = map { $_ =~ /(.+)/ } ($^X, __FILE__); + + # this is cheating, and may even hang here and there (testing on windows passed fine) + # will be replaced with Test::SubExec::Noninteractive in due course + require IPC::Open2; + IPC::Open2::open2(my $out, undef, @cmd); + while (my $ln = <$out>) { + print " $ln"; + } + + wait; + ok (! $?, "Wstat $? from: @cmd"); +} + +done_testing; + # clean up our mess END { if (my $dbh = eval { $schema->storage->_dbh }) { eval { $dbh->do("DROP TABLE $_") } - for qw/artist bindtype_test money_test/; + for qw/artist bindtype_test money_test computed_column_test/; } + + undef $schema; }