X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F73oracle.t;h=f565de99293303ba4d27a980456804bee37cddd1;hb=9851dada033612ff82dd6a6a6d9da84478a30ed1;hp=12929b61a229d4e0048983b55e23f1e739fc68d4;hpb=7c4ead2d913c8defc6e358b659c3bf310af1e11e;p=dbsrgits%2FDBIx-Class.git diff --git a/t/73oracle.t b/t/73oracle.t index 12929b6..f565de9 100644 --- a/t/73oracle.t +++ b/t/73oracle.t @@ -1,6 +1,34 @@ +{ + package # hide from PAUSE + DBICTest::Schema::ArtistFQN; + + use base 'DBIx::Class::Core'; + + __PACKAGE__->table( + defined $ENV{DBICTEST_ORA_USER} + ? $ENV{DBICTEST_ORA_USER} . '.artist' + : 'artist' + ); + __PACKAGE__->add_columns( + 'artistid' => { + data_type => 'integer', + is_auto_increment => 1, + }, + 'name' => { + data_type => 'varchar', + size => 100, + is_nullable => 1, + }, + ); + __PACKAGE__->set_primary_key('artistid'); + + 1; +} + use strict; use warnings; +use Test::Exception; use Test::More; use lib qw(t/lib); use DBICTest; @@ -12,8 +40,9 @@ plan skip_all => 'Set $ENV{DBICTEST_ORA_DSN}, _USER and _PASS to run this test. ' as well as following sequences: \'pkid1_seq\', \'pkid2_seq\' and \'nonpkid_seq\'' unless ($dsn && $user && $pass); -plan tests => 23; +plan tests => 35; +DBICTest::Schema->load_classes('ArtistFQN'); my $schema = DBICTest::Schema->connect($dsn, $user, $pass); my $dbh = $schema->storage->dbh; @@ -35,7 +64,7 @@ $dbh->do("CREATE SEQUENCE nonpkid_seq START WITH 20 MAXVALUE 999999 MINVALUE 0") $dbh->do("CREATE TABLE artist (artistid NUMBER(12), name VARCHAR(255), rank NUMBER(38), charfield VARCHAR2(10))"); $dbh->do("CREATE TABLE sequence_test (pkid1 NUMBER(12), pkid2 NUMBER(12), nonpkid NUMBER(12), name VARCHAR(255))"); $dbh->do("CREATE TABLE cd (cdid NUMBER(12), artist NUMBER(12), title VARCHAR(255), year VARCHAR(4))"); -$dbh->do("CREATE TABLE track (trackid NUMBER(12), cd NUMBER(12), position NUMBER(12), title VARCHAR(255), last_updated_on DATE)"); +$dbh->do("CREATE TABLE track (trackid NUMBER(12), cd NUMBER(12), position NUMBER(12), title VARCHAR(255), last_updated_on DATE, last_updated_at DATE, small_dt DATE)"); $dbh->do("ALTER TABLE artist ADD (CONSTRAINT artist_pk PRIMARY KEY (artistid))"); $dbh->do("ALTER TABLE sequence_test ADD (CONSTRAINT sequence_test_constraint PRIMARY KEY (pkid1, pkid2))"); @@ -52,6 +81,23 @@ $dbh->do(qq{ END; }); +{ + # Swiped from t/bindtype_columns.t to avoid creating my own Resultset. + + local $SIG{__WARN__} = sub {}; + eval { $dbh->do('DROP TABLE bindtype_test') }; + + $dbh->do(qq[ + CREATE TABLE bindtype_test + ( + id integer NOT NULL PRIMARY KEY, + bytea integer NULL, + blob blob NULL, + clob clob NULL + ) + ],{ RaiseError => 1, PrintError => 1 }); +} + # This is in Core now, but it's here just to test that it doesn't break $schema->class('Artist')->load_components('PK::Auto'); # These are compat shims for PK::Auto... @@ -62,27 +108,52 @@ $schema->class('Track')->load_components('PK::Auto::Oracle'); my $new = $schema->resultset('Artist')->create({ name => 'foo' }); is($new->artistid, 1, "Oracle Auto-PK worked"); +# test again with fully-qualified table name +$new = $schema->resultset('ArtistFQN')->create( { name => 'bar' } ); +is( $new->artistid, 2, "Oracle Auto-PK worked with fully-qualified tablename" ); + # test join with row count ambiguity + my $cd = $schema->resultset('CD')->create({ cdid => 1, artist => 1, title => 'EP C', year => '2003' }); -my $track = $schema->resultset('Track')->create({ trackid => 1, cd => 1, position => 1, title => 'Track1' }); +my $track = $schema->resultset('Track')->create({ trackid => 1, cd => 1, + position => 1, title => 'Track1' }); my $tjoin = $schema->resultset('Track')->search({ 'me.title' => 'Track1'}, { join => 'cd', rows => 2 } ); -is($tjoin->next->title, 'Track1', "ambiguous column ok"); +ok(my $row = $tjoin->next); + +is($row->title, 'Track1', "ambiguous column ok"); # check count distinct with multiple columns my $other_track = $schema->resultset('Track')->create({ trackid => 2, cd => 1, position => 1, title => 'Track2' }); + my $tcount = $schema->resultset('Track')->search( - {}, - { - select => [{count => {distinct => ['position', 'title']}}], - as => ['count'] - } - ); + {}, + { + select => [ qw/position title/ ], + distinct => 1, + } +); +is($tcount->count, 2, 'multiple column COUNT DISTINCT ok'); + +$tcount = $schema->resultset('Track')->search( + {}, + { + columns => [ qw/position title/ ], + distinct => 1, + } +); +is($tcount->count, 2, 'multiple column COUNT DISTINCT ok'); -is($tcount->next->get_column('count'), 2, "multiple column select distinct ok"); +$tcount = $schema->resultset('Track')->search( + {}, + { + group_by => [ qw/position title/ ] + } +); +is($tcount->count, 2, 'multiple column COUNT DISTINCT using column syntax ok'); # test LIMIT support for (1..6) { @@ -90,7 +161,7 @@ for (1..6) { } my $it = $schema->resultset('Artist')->search( {}, { rows => 3, - offset => 2, + offset => 3, order_by => 'artistid' } ); is( $it->count, 3, "LIMIT count ok" ); @@ -115,9 +186,31 @@ for (1..5) { my $st = $schema->resultset('SequenceTest')->create({ name => 'foo', pkid1 => 55 }); is($st->pkid1, 55, "Oracle Auto-PK without trigger: First primary key set manually"); +{ + my %binstr = ( 'small' => join('', map { chr($_) } ( 1 .. 127 )) ); + $binstr{'large'} = $binstr{'small'} x 1024; + + my $maxloblen = length $binstr{'large'}; + note "Localizing LongReadLen to $maxloblen to avoid truncation of test data"; + local $dbh->{'LongReadLen'} = $maxloblen; + + my $rs = $schema->resultset('BindType'); + my $id = 0; + + foreach my $type (qw( blob clob )) { + foreach my $size (qw( small large )) { + $id++; + + lives_ok { $rs->create( { 'id' => $id, $type => $binstr{$size} } ) } + "inserted $size $type without dying"; + ok($rs->find($id)->$type eq $binstr{$size}, "verified inserted $size $type" ); + } + } +} + # clean up our mess END { - if($dbh) { + if($schema && ($dbh = $schema->storage->dbh)) { $dbh->do("DROP SEQUENCE artist_seq"); $dbh->do("DROP SEQUENCE pkid1_seq"); $dbh->do("DROP SEQUENCE pkid2_seq"); @@ -126,6 +219,7 @@ END { $dbh->do("DROP TABLE sequence_test"); $dbh->do("DROP TABLE cd"); $dbh->do("DROP TABLE track"); + $dbh->do("DROP TABLE bindtype_test"); } }