X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=t%2F73oracle.t;h=e7096ea4d4fd32c2099f0aacffa764f7a842f63c;hp=b353e37cb3b0b9f77b20a9c1b6fc26f98fda0ae9;hb=4c90556806f286093d0806e858abdba329e6dfd3;hpb=ab4f4e4cdbe2eee3b6230d03f152942e96fb24f9 diff --git a/t/73oracle.t b/t/73oracle.t index b353e37..e7096ea 100644 --- a/t/73oracle.t +++ b/t/73oracle.t @@ -1,3 +1,25 @@ +BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) } +use DBIx::Class::Optional::Dependencies -skip_all_without => 'test_rdbms_oracle'; + +use strict; +use warnings; + +use Test::Exception; +use Test::More; +use Try::Tiny; +use DBIx::Class::_Util 'set_subname'; + +use DBICTest; + +$ENV{NLS_SORT} = "BINARY"; +$ENV{NLS_COMP} = "BINARY"; +$ENV{NLS_LANG} = "AMERICAN"; + +my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_ORA_${_}" } qw/DSN USER PASS/}; + +# optional: +my ($dsn2, $user2, $pass2) = @ENV{map { "DBICTEST_ORA_EXTRAUSER_${_}" } qw/DSN USER PASS/}; + { package # hide from PAUSE DBICTest::Schema::ArtistFQN; @@ -5,200 +27,196 @@ use base 'DBIx::Class::Core'; __PACKAGE__->table( - defined $ENV{DBICTEST_ORA_USER} - ? $ENV{DBICTEST_ORA_USER} . '.artist' - : 'artist' + $ENV{DBICTEST_ORA_USER} + ? (uc $ENV{DBICTEST_ORA_USER}) . '.artist' + : '??_no_user_??' ); __PACKAGE__->add_columns( - 'artistid' => { - data_type => 'integer', - is_auto_increment => 1, - }, - 'name' => { - data_type => 'varchar', - size => 100, - is_nullable => 1, - }, - 'autoinc_col' => { - data_type => 'integer', - is_auto_increment => 1, - }, + 'artistid' => { + data_type => 'integer', + is_auto_increment => 1, + }, + 'name' => { + data_type => 'varchar', + size => 100, + is_nullable => 1, + }, + 'autoinc_col' => { + data_type => 'integer', + is_auto_increment => 1, + }, + 'default_value_col' => { + data_type => 'varchar', + size => 100, + is_nullable => 0, + retrieve_on_insert => 1, + } ); - __PACKAGE__->set_primary_key('artistid'); + __PACKAGE__->set_primary_key(qw/ artistid autoinc_col /); 1; } -use strict; -use warnings; - -use Test::Exception; -use Test::More; +DBICTest::Schema->load_classes('ArtistFQN'); -use lib qw(t/lib); -use DBICTest; -use DBIC::SqlMakerTest; +# This is in Core now, but it's here just to test that it doesn't break +DBICTest::Schema::Artist->load_components('PK::Auto'); +# These are compat shims for PK::Auto... +DBICTest::Schema::CD->load_components('PK::Auto::Oracle'); +DBICTest::Schema::Track->load_components('PK::Auto::Oracle'); -my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_ORA_${_}" } qw/DSN USER PASS/}; -# optional: -my ($dsn2, $user2, $pass2) = @ENV{map { "DBICTEST_ORA_EXTRAUSER_${_}" } qw/DSN USER PASS/}; +# check if we indeed do support stuff +my $v = do { + 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"; +}; -plan skip_all => 'Set $ENV{DBICTEST_ORA_DSN}, _USER and _PASS to run this test. ' . - 'Warning: This test drops and creates tables called \'artist\', \'cd\', \'track\' and \'sequence_test\''. - ' as well as following sequences: \'pkid1_seq\', \'pkid2_seq\' and \'nonpkid_seq\'' - unless ($dsn && $user && $pass); +my $test_server_supports_only_orajoins = $v < 9; -DBICTest::Schema->load_classes('ArtistFQN'); -my $schema = DBICTest::Schema->connect($dsn, $user, $pass); +# TODO find out which version supports the RETURNING syntax +# 8i (8.1) has it and earlier docs are a 404 on oracle.com +my $test_server_supports_insert_returning = $v >= 8.001; -my $dbh = $schema->storage->dbh; +is ( + DBICTest::Schema->connect($dsn, $user, $pass)->storage->_use_insert_returning, + $test_server_supports_insert_returning, + 'insert returning capability guessed correctly' +); -do_creates($dbh); +isa_ok (DBICTest::Schema->connect($dsn, $user, $pass)->storage->sql_maker, 'DBIx::Class::SQLMaker::Oracle'); -{ - # Swiped from t/bindtype_columns.t to avoid creating my own Resultset. +# see if determining a driver with bad credentials throws propely +throws_ok { + DBICTest::Schema->connect($dsn, "BORKED BORKED USER $user", $pass)->storage->sql_maker; +} qr/DBI Connection failed/; - 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 }); -} +########## +# the recyclebin (new for 10g) sometimes comes in the way +my $on_connect_sql = $v >= 10 ? ["ALTER SESSION SET recyclebin = OFF"] : []; -# 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... -$schema->class('CD')->load_components('PK::Auto::Oracle'); -$schema->class('Track')->load_components('PK::Auto::Oracle'); +# iterate all tests on following options +my @tryopt = ( + { on_connect_do => $on_connect_sql }, + { quote_char => '"', on_connect_do => $on_connect_sql }, +); +# keep a database handle open for cleanup +my ($dbh, $dbh2); -# test primary key handling with multiple triggers -my $new = $schema->resultset('Artist')->create({ name => 'foo' }); -is($new->artistid, 1, "Oracle Auto-PK worked"); +my $schema; +for my $use_insert_returning ($test_server_supports_insert_returning ? (1,0) : (0) ) { + for my $force_ora_joins ($test_server_supports_only_orajoins ? (0) : (0,1) ) { -like ($new->result_source->column_info('artistid')->{sequence}, qr/\.artist_pk_seq$/, 'Correct PK sequence selected'); + # doing it here instead of the actual class to keep the main thing under dfs + # and thus keep catching false positives (so far none, but one never knows) + mro::set_mro("DBICTest::Schema", "c3"); -# test again with fully-qualified table name -my $artistfqn_rs = $schema->resultset('ArtistFQN'); -my $artist_rsrc = $artistfqn_rs->result_source; + my $old_connection = DBICTest::Schema->can('connection'); -delete $artist_rsrc->column_info('artistid')->{sequence}; + no warnings qw/once redefine/; + local *DBICTest::Schema::connection = set_subname 'DBICTest::Schema::connection' => sub { + my $s = shift->$old_connection (@_); + $s->storage->_use_insert_returning ($use_insert_returning); + $s->storage->sql_maker_class('DBIx::Class::SQLMaker::OracleJoins') if $force_ora_joins; + $s; + }; -$new = $artistfqn_rs->create( { name => 'bar' } ); -is( $new->artistid, 2, "Oracle Auto-PK worked with fully-qualified tablename" ); + for my $opt (@tryopt) { + # clean all cached sequences from previous run + for (map { values %{DBICTest::Schema->source($_)->columns_info} } (qw/Artist CD Track/) ) { + delete $_->{sequence}; + } -delete $artist_rsrc->column_info('artistid')->{sequence}; + my $schema = DBICTest::Schema->connect($dsn, $user, $pass, $opt); -$new = $artistfqn_rs->create( { name => 'bar', autoinc_col => 1000 } ); -is( $new->artistid, 3, "Oracle Auto-PK worked with fully-qualified tablename" ); -is( $new->autoinc_col, 1000, "Oracle Auto-Inc overruled with fully-qualified tablename"); + $dbh = $schema->storage->dbh; + my $q = $schema->storage->sql_maker->quote_char || ''; -like ($artist_rsrc->column_info('artistid')->{sequence}, qr/\.artist_pk_seq$/, 'Still correct PK sequence'); + do_creates($dbh, $q); -# test LIMIT support -for (1..6) { - $schema->resultset('Artist')->create({ name => 'Artist ' . $_ }); + _run_tests($schema, $opt); + } + } } -my $it = $schema->resultset('Artist')->search( { name => { -like => 'Artist %' }}, - { rows => 3, - offset => 4, - order_by => 'artistid' } -); -is( $it->count, 2, "LIMIT count past end of RS ok" ); -is( $it->next->name, "Artist 5", "iterator->next ok" ); -is( $it->next->name, "Artist 6", "iterator->next ok" ); -is( $it->next, undef, "next past end of resultset ok" ); -my $cd = $schema->resultset('CD')->create({ artist => 1, title => 'EP C', year => '2003' }); -is($cd->cdid, 1, "Oracle Auto-PK worked - using scalar ref as table name"); +sub _run_tests { + my ($schema, $opt) = @_; -# test rel names over the 30 char limit -{ - my $query = $schema->resultset('Artist')->search({ - artistid => 1 - }, { - prefetch => 'cds_very_very_very_long_relationship_name' - }); + my $q = $schema->storage->sql_maker->quote_char || ''; - lives_and { - is $query->first->cds_very_very_very_long_relationship_name->first->cdid, 1 - } 'query with rel name over 30 chars survived and worked'; +# test primary key handling with multiple triggers + my ($new, $seq); - # rel name over 30 char limit with user condition - # This requires walking the SQLA data structure. - { - local $TODO = 'user condition on rel longer than 30 chars'; + my $new_artist = $schema->resultset('Artist')->create({ name => 'foo' }); + my $new_cd = $schema->resultset('CD')->create({ artist => 1, title => 'EP C', year => '2003' }); - $query = $schema->resultset('Artist')->search({ - 'cds_very_very_very_long_relationship_name.title' => 'EP C' - }, { - prefetch => 'cds_very_very_very_long_relationship_name' - }); + SKIP: { + skip 'not detecting sequences when using INSERT ... RETURNING', 4 + if $schema->storage->_use_insert_returning; - lives_and { - is $query->first->cds_very_very_very_long_relationship_name->first->cdid, 1 - } 'query with rel name over 30 chars and user condition survived and worked'; + is($new_artist->artistid, 1, "Oracle Auto-PK worked for standard sqlt-like trigger"); + $seq = $new_artist->result_source->column_info('artistid')->{sequence}; + $seq = $$seq if ref $seq; + like ($seq, qr/\.${q}artist_pk_seq${q}$/, 'Correct PK sequence selected for sqlt-like trigger'); + + is($new_cd->cdid, 1, 'Oracle Auto-PK worked - using scalar ref as table name/custom weird trigger'); + $seq = $new_cd->result_source->column_info('cdid')->{sequence}; + $seq = $$seq if ref $seq; + like ($seq, qr/\.${q}cd_seq${q}$/, 'Correct PK sequence selected for custom trigger'); } -} -# test join with row count ambiguity +# test PKs again with fully-qualified table name + my $artistfqn_rs = $schema->resultset('ArtistFQN'); + my $artist_rsrc = $artistfqn_rs->result_source; -my $track = $schema->resultset('Track')->create({ cd => $cd->cdid, - position => 1, title => 'Track1' }); -my $tjoin = $schema->resultset('Track')->search({ 'me.title' => 'Track1'}, - { join => 'cd', - rows => 2 } -); + delete $artist_rsrc->column_info('artistid')->{sequence}; + $new = $artistfqn_rs->create( { name => 'bar' } ); -ok(my $row = $tjoin->next); + is_deeply( {map { $_ => $new->$_ } $artist_rsrc->primary_columns}, + { artistid => 2, autoinc_col => 2}, + "Oracle Multi-Auto-PK worked with fully-qualified tablename" ); -is($row->title, 'Track1', "ambiguous column ok"); -# check count distinct with multiple columns -my $other_track = $schema->resultset('Track')->create({ cd => $cd->cdid, position => 1, title => 'Track2' }); + delete $artist_rsrc->column_info('artistid')->{sequence}; + $new = $artistfqn_rs->create( { name => 'bar', autoinc_col => 1000 } ); -my $tcount = $schema->resultset('Track')->search( - {}, - { - select => [ qw/position title/ ], - distinct => 1, - } -); -is($tcount->count, 2, 'multiple column COUNT DISTINCT ok'); + is( $new->artistid, 3, "Oracle Auto-PK worked with fully-qualified tablename" ); + is( $new->autoinc_col, 1000, "Oracle Auto-Inc overruled with fully-qualified tablename"); -$tcount = $schema->resultset('Track')->search( - {}, - { - columns => [ qw/position title/ ], - distinct => 1, + + is( $new->default_value_col, 'default_value', $schema->storage->_use_insert_returning + ? 'Check retrieve_on_insert on default_value_col with INSERT ... RETURNING' + : 'Check retrieve_on_insert on default_value_col without INSERT ... RETURNING' + ); + + SKIP: { + skip 'not detecting sequences when using INSERT ... RETURNING', 1 + if $schema->storage->_use_insert_returning; + + $seq = $new->result_source->column_info('artistid')->{sequence}; + $seq = $$seq if ref $seq; + like ($seq, qr/\.${q}artist_pk_seq${q}$/, 'Correct PK sequence selected for sqlt-like trigger'); } -); -is($tcount->count, 2, 'multiple column COUNT DISTINCT ok'); -$tcount = $schema->resultset('Track')->search( - {}, - { - group_by => [ qw/position title/ ] + +# test LIMIT support + for (1..6) { + $schema->resultset('Artist')->create({ name => 'Artist ' . $_ }); } -); -is($tcount->count, 2, 'multiple column COUNT DISTINCT using column syntax ok'); + my $it = $schema->resultset('Artist')->search( { name => { -like => 'Artist %' } }, { + rows => 3, + offset => 4, + order_by => 'artistid' + }); -{ - my $rs = $schema->resultset('Track')->search( undef, { columns=>[qw/trackid position/], group_by=> [ qw/trackid position/ ] , rows => 2, offset=>1 }); - my @results = $rs->all; - is( scalar @results, 1, "Group by with limit OK" ); -} + is( $it->count, 2, "LIMIT count past end of RS ok" ); + is( $it->next->name, "Artist 5", "iterator->next ok" ); + is( $it->next->name, "Artist 6", "iterator->next ok" ); + is( $it->next, undef, "next past end of resultset ok" ); # test identifiers over the 30 char limit -{ lives_ok { my @results = $schema->resultset('CD')->search(undef, { prefetch => 'very_long_artist_relationship', @@ -207,626 +225,440 @@ is($tcount->count, 2, 'multiple column COUNT DISTINCT using column syntax ok'); })->all; ok( scalar @results > 0, 'limit with long identifiers returned something'); } 'limit with long identifiers executed successfully'; -} -# test with_deferred_fk_checks -lives_ok { - $schema->storage->with_deferred_fk_checks(sub { - $schema->resultset('Track')->create({ - trackid => 999, cd => 999, position => 1, title => 'deferred FK track' - }); - $schema->resultset('CD')->create({ - artist => 1, cdid => 999, year => '2003', title => 'deferred FK cd' - }); - }); -} 'with_deferred_fk_checks code survived'; -is eval { $schema->resultset('Track')->find(999)->title }, 'deferred FK track', - 'code in with_deferred_fk_checks worked'; - -throws_ok { - $schema->resultset('Track')->create({ - trackid => 1, cd => 9999, position => 1, title => 'Track1' +# test rel names over the 30 char limit + my $query = $schema->resultset('Artist')->search({ + artistid => 1 + }, { + prefetch => 'cds_very_very_very_long_relationship_name' }); -} qr/constraint/i, 'with_deferred_fk_checks is off'; - -# test auto increment using sequences WITHOUT triggers -for (1..5) { - my $st = $schema->resultset('SequenceTest')->create({ name => 'foo' }); - is($st->pkid1, $_, "Oracle Auto-PK without trigger: First primary key"); - is($st->pkid2, $_ + 9, "Oracle Auto-PK without trigger: Second primary key"); - is($st->nonpkid, $_ + 19, "Oracle Auto-PK without trigger: Non-primary key"); -} -my $st = $schema->resultset('SequenceTest')->create({ name => 'foo', pkid1 => 55 }); -is($st->pkid1, 55, "Oracle Auto-PK without trigger: First primary key set manually"); - -SKIP: { - 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; + lives_and { + is $query->first->cds_very_very_very_long_relationship_name->first->cdid, 1 + } 'query with rel name over 30 chars survived and worked'; - my $rs = $schema->resultset('BindType'); - my $id = 0; +# test rel names over the 30 char limit using group_by and join + { + my @group_cols = ( 'me.name' ); + my $query = $schema->resultset('Artist')->search({ + artistid => 1 + }, { + select => \@group_cols, + as => [map { /^\w+\.(\w+)$/ } @group_cols], + join => [qw( cds_very_very_very_long_relationship_name )], + group_by => \@group_cols, + }); - if ($DBD::Oracle::VERSION eq '1.23') { - throws_ok { $rs->create({ id => 1, blob => $binstr{large} }) } - qr/broken/, - 'throws on blob insert with DBD::Oracle == 1.23'; + lives_and { + my @got = $query->get_column('name')->all(); + is_deeply \@got, [$new_artist->name]; + } 'query with rel name over 30 chars worked on join, group_by for me col'; - skip 'buggy BLOB support in DBD::Oracle 1.23', 7; + lives_and { + is $query->count(), 1 + } 'query with rel name over 30 chars worked on join, group_by, count for me col'; } + { + my @group_cols = ( 'cds_very_very_very_long_relationship_name.title' ); + my $query = $schema->resultset('Artist')->search({ + artistid => 1 + }, { + select => \@group_cols, + as => [map { /^\w+\.(\w+)$/ } @group_cols], + join => [qw( cds_very_very_very_long_relationship_name )], + group_by => \@group_cols, + }); - # disable BLOB mega-output - my $orig_debug = $schema->storage->debug; - $schema->storage->debug (0); + lives_and { + my @got = $query->get_column('title')->all(); + is_deeply \@got, [$new_cd->title]; + } 'query with rel name over 30 chars worked on join, group_by for long rel col'; - foreach my $type (qw( blob clob )) { - foreach my $size (qw( small large )) { - $id++; + lives_and { + is $query->count(), 1 + } 'query with rel name over 30 chars worked on join, group_by, count for long rel col'; + } - lives_ok { $rs->create( { 'id' => $id, $type => $binstr{$size} } ) } - "inserted $size $type without dying"; + # rel name over 30 char limit with user condition + # This requires walking the SQLA data structure. + { + $query = $schema->resultset('Artist')->search({ + 'cds_very_very_very_long_relationship_name.title' => 'EP C' + }, { + prefetch => 'cds_very_very_very_long_relationship_name' + }); - ok($rs->find($id)->$type eq $binstr{$size}, "verified inserted $size $type" ); - } + lives_and { + is $query->first->cds_very_very_very_long_relationship_name->first->cdid, 1 + } 'query with rel name over 30 chars and user condition survived and worked'; } - $schema->storage->debug ($orig_debug); -} +# test join with row count ambiguity + my $cd = $schema->resultset('CD')->next; + my $track = $cd->create_related('tracks', { position => 1, title => 'Track1'} ); + my $tjoin = $schema->resultset('Track')->search({ 'me.title' => 'Track1'}, { + join => 'cd', rows => 2 + }); -### test hierarchical queries -if ( $schema->storage->isa('DBIx::Class::Storage::DBI::Oracle::Generic') ) { - my $source = $schema->source('Artist'); + ok(my $row = $tjoin->next); - $source->add_column( 'parentid' ); + is($row->title, 'Track1', "ambiguous column ok"); - $source->add_relationship('children', 'DBICTest::Schema::Artist', - { 'foreign.parentid' => 'self.artistid' }, - { - accessor => 'multi', - join_type => 'LEFT', - cascade_delete => 1, - cascade_copy => 1, - } ); - $source->add_relationship('parent', 'DBICTest::Schema::Artist', - { 'foreign.artistid' => 'self.parentid' }, - { accessor => 'single' } ); - DBICTest::Schema::Artist->add_column( 'parentid' ); - DBICTest::Schema::Artist->has_many( - children => 'DBICTest::Schema::Artist', - { 'foreign.parentid' => 'self.artistid' } - ); - DBICTest::Schema::Artist->belongs_to( - parent => 'DBICTest::Schema::Artist', - { 'foreign.artistid' => 'self.parentid' } - ); - $schema->resultset('Artist')->create ({ - name => 'root', - rank => 1, - cds => [], - children => [ - { - name => 'child1', - rank => 2, - children => [ - { - name => 'grandchild', - rank => 3, - cds => [ - { - title => "grandchilds's cd" , - year => '2008', - tracks => [ - { - position => 1, - title => 'Track 1 grandchild', - } - ], - } - ], - children => [ - { - name => 'greatgrandchild', - rank => 3, - } - ], - } - ], - }, - { - name => 'child2', - rank => 3, - }, - ], - }); - $schema->resultset('Artist')->create( - { - name => 'cycle-root', - children => [ - { - name => 'cycle-child1', - children => [ { name => 'cycle-grandchild' } ], - }, - { name => 'cycle-child2' }, - ], - } - ); - - $schema->resultset('Artist')->find({ name => 'cycle-root' }) - ->update({ parentid => \'artistid' }); +# check count distinct with multiple columns + my $other_track = $schema->resultset('Track')->create({ cd => $cd->cdid, position => 1, title => 'Track2' }); - # select the whole tree + my $tcount = $schema->resultset('Track')->search( + {}, { - my $rs = $schema->resultset('Artist')->search({}, { - start_with => { name => 'root' }, - connect_by => { parentid => { -prior => \ 'artistid' } }, - }); - - is_same_sql_bind ( - $rs->as_query, - '( - SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid - FROM artist me - START WITH name = ? - CONNECT BY parentid = PRIOR artistid - )', - [ [ name => 'root'] ], - ); - is_deeply ( - [ $rs->get_column ('name')->all ], - [ qw/root child1 grandchild greatgrandchild child2/ ], - 'got artist tree', - ); - - - is_same_sql_bind ( - $rs->count_rs->as_query, - '( - SELECT COUNT( * ) - FROM artist me - START WITH name = ? - CONNECT BY parentid = PRIOR artistid - )', - [ [ name => 'root'] ], - ); - - is( $rs->count, 5, 'Connect By count ok' ); + select => [ qw/position title/ ], + distinct => 1, } + ); + is($tcount->count, 2, 'multiple column COUNT DISTINCT ok'); - # use order siblings by statement + $tcount = $schema->resultset('Track')->search( + {}, { - my $rs = $schema->resultset('Artist')->search({}, { - start_with => { name => 'root' }, - connect_by => { parentid => { -prior => \ 'artistid' } }, - order_siblings_by => { -desc => 'name' }, - }); - - is_same_sql_bind ( - $rs->as_query, - '( - SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid - FROM artist me - START WITH name = ? - CONNECT BY parentid = PRIOR artistid - ORDER SIBLINGS BY name DESC - )', - [ [ name => 'root'] ], - ); - - is_deeply ( - [ $rs->get_column ('name')->all ], - [ qw/root child2 child1 grandchild greatgrandchild/ ], - 'Order Siblings By ok', - ); + columns => [ qw/position title/ ], + distinct => 1, } + ); + is($tcount->count, 2, 'multiple column COUNT DISTINCT ok'); - # get the root node + $tcount = $schema->resultset('Track')->search( + {}, { - my $rs = $schema->resultset('Artist')->search({ parentid => undef }, { - start_with => { name => 'root' }, - connect_by => { parentid => { -prior => \ 'artistid' } }, - }); - - is_same_sql_bind ( - $rs->as_query, - '( - SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid - FROM artist me - WHERE ( parentid IS NULL ) - START WITH name = ? - CONNECT BY parentid = PRIOR artistid - )', - [ [ name => 'root'] ], - ); - - is_deeply( - [ $rs->get_column('name')->all ], - [ 'root' ], - 'found root node', - ); + group_by => [ qw/position title/ ] } + ); + is($tcount->count, 2, 'multiple column COUNT DISTINCT using column syntax ok'); - # combine a connect by with a join - { - my $rs = $schema->resultset('Artist')->search( - {'cds.title' => { -like => '%cd'} }, - { - join => 'cds', - start_with => { 'me.name' => 'root' }, - connect_by => { parentid => { -prior => \ 'artistid' } }, - } - ); - - is_same_sql_bind ( - $rs->as_query, - '( - SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid - FROM artist me - LEFT JOIN cd cds ON cds.artist = me.artistid - WHERE ( cds.title LIKE ? ) - START WITH me.name = ? - CONNECT BY parentid = PRIOR artistid - )', - [ [ 'cds.title' => '%cd' ], [ 'me.name' => 'root' ] ], - ); - - is_deeply( - [ $rs->get_column('name')->all ], - [ 'grandchild' ], - 'Connect By with a join result name ok' - ); - - - is_same_sql_bind ( - $rs->count_rs->as_query, - '( - SELECT COUNT( * ) - FROM artist me - LEFT JOIN cd cds ON cds.artist = me.artistid - WHERE ( cds.title LIKE ? ) - START WITH me.name = ? - CONNECT BY parentid = PRIOR artistid - )', - [ [ 'cds.title' => '%cd' ], [ 'me.name' => 'root' ] ], - ); - - is( $rs->count, 1, 'Connect By with a join; count ok' ); - } - # combine a connect by with order_by - { - my $rs = $schema->resultset('Artist')->search({}, { - start_with => { name => 'root' }, - connect_by => { parentid => { -prior => \ 'artistid' } }, - order_by => { -asc => [ 'LEVEL', 'name' ] }, +# check group_by + my $g_rs = $schema->resultset('Track')->search( undef, { columns=>[qw/trackid position/], group_by=> [ qw/trackid position/ ] , rows => 2, offset => 1 }); + is( scalar $g_rs->all, 1, "Group by with limit OK" ); + + +# test with_deferred_fk_checks + lives_ok { + $schema->storage->with_deferred_fk_checks(sub { + $schema->resultset('Track')->create({ + trackid => 999, cd => 999, position => 1, title => 'deferred FK track' }); + $schema->resultset('CD')->create({ + artist => 1, cdid => 999, year => '2003', title => 'deferred FK cd' + }); + }); + } 'with_deferred_fk_checks code survived'; - is_same_sql_bind ( - $rs->as_query, - '( - SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid - FROM artist me - START WITH name = ? - CONNECT BY parentid = PRIOR artistid - ORDER BY LEVEL ASC, name ASC - )', - [ [ name => 'root' ] ], - ); - - is_deeply ( - [ $rs->get_column ('name')->all ], - [ qw/root child1 child2 grandchild greatgrandchild/ ], - 'Connect By with a order_by - result name ok' - ); - } + is eval { $schema->resultset('Track')->find(999)->title }, 'deferred FK track', + 'code in with_deferred_fk_checks worked'; + throws_ok { + $schema->resultset('Track')->create({ + trackid => 1, cd => 9999, position => 1, title => 'Track1' + }); + } qr/constraint/i, 'with_deferred_fk_checks is off'; - # limit a connect by - { - my $rs = $schema->resultset('Artist')->search({}, { - start_with => { name => 'root' }, - connect_by => { parentid => { -prior => \ 'artistid' } }, - order_by => { -asc => 'name' }, - rows => 2, - }); - is_same_sql_bind ( - $rs->as_query, - '( - SELECT artistid, name, rank, charfield, parentid FROM ( - SELECT - me.artistid, - me.name, - me.rank, - me.charfield, - me.parentid - FROM artist me - START WITH name = ? - CONNECT BY parentid = PRIOR artistid - ORDER BY name ASC - ) me - WHERE ROWNUM <= 2 - )', - [ [ name => 'root' ] ], - ); - - is_deeply ( - [ $rs->get_column ('name')->all ], - [qw/child1 child2/], - 'LIMIT a Connect By query - correct names' - ); - - # TODO: - # prints "START WITH name = ? - # CONNECT BY artistid = PRIOR parentid " - # after count_subq, - # I will fix this later... - # - is_same_sql_bind ( - $rs->count_rs->as_query, - '( - SELECT COUNT( * ) FROM ( - SELECT artistid - FROM ( - SELECT - me.artistid - FROM artist me - START WITH name = ? - CONNECT BY parentid = PRIOR artistid - ) me - WHERE ROWNUM <= 2 - ) me - )', - [ [ name => 'root' ] ], - ); - - is( $rs->count, 2, 'Connect By; LIMIT count ok' ); - } +# test auto increment using sequences WITHOUT triggers + for (1..5) { + my $st = $schema->resultset('SequenceTest')->create({ name => 'foo' }); + is($st->pkid1, $_, "Oracle Auto-PK without trigger: First primary key"); + is($st->pkid2, $_ + 9, "Oracle Auto-PK without trigger: Second primary key"); + is($st->nonpkid, $_ + 19, "Oracle Auto-PK without trigger: Non-primary key"); + } + my $st = $schema->resultset('SequenceTest')->create({ name => 'foo', pkid1 => 55 }); + is($st->pkid1, 55, "Oracle Auto-PK without trigger: First primary key set manually"); - # combine a connect_by with group_by and having - { - my $rs = $schema->resultset('Artist')->search({}, { - select => ['count(rank)'], - start_with => { name => 'root' }, - connect_by => { parentid => { -prior => \ 'artistid' } }, - group_by => ['rank'], - having => { 'count(rank)' => { '<', 2 } }, - }); - is_same_sql_bind ( - $rs->as_query, - '( - SELECT count(rank) - FROM artist me - START WITH name = ? - CONNECT BY parentid = PRIOR artistid - GROUP BY rank HAVING count(rank) < ? - )', - [ [ name => 'root' ], [ 'count(rank)' => 2 ] ], - ); - - is_deeply ( - [ $rs->get_column ('count(rank)')->all ], - [1, 1], - 'Group By a Connect By query - correct values' - ); - } +# test populate (identity, success and error handling) + my $art_rs = $schema->resultset('Artist'); + my $seq_pos = $art_rs->get_column('artistid')->max; + ok($seq_pos, 'Starting with something in the artist table'); - # select the whole cycle tree without nocylce - { - my $rs = $schema->resultset('Artist')->search({}, { - start_with => { name => 'cycle-root' }, - connect_by => { parentid => { -prior => \ 'artistid' } }, - }); - eval { $rs->get_column ('name')->all }; - if ( $@ =~ /ORA-01436/ ){ # ORA-01436: CONNECT BY loop in user data - pass "connect by initify loop detection without nocycle"; - }else{ - fail "connect by initify loop detection without nocycle, not detected by oracle"; - } - } - # select the whole cycle tree with nocylce - { - my $rs = $schema->resultset('Artist')->search({}, { - start_with => { name => 'cycle-root' }, - '+select' => [ \ 'CONNECT_BY_ISCYCLE' ], - connect_by_nocycle => { parentid => { -prior => \ 'artistid' } }, - }); + my $pop_rs = $schema->resultset('Artist')->search( + { name => { -like => 'pop_art_%' } }, + { order_by => 'artistid' } + ); - is_same_sql_bind ( - $rs->as_query, - '( - SELECT me.artistid, me.name, me.rank, me.charfield, me.parentid, CONNECT_BY_ISCYCLE - FROM artist me - START WITH name = ? - CONNECT BY NOCYCLE parentid = PRIOR artistid - )', - [ [ name => 'cycle-root'] ], - ); - is_deeply ( - [ $rs->get_column ('name')->all ], - [ qw/cycle-root cycle-child1 cycle-grandchild cycle-child2/ ], - 'got artist tree with nocycle (name)', - ); - is_deeply ( - [ $rs->get_column ('CONNECT_BY_ISCYCLE')->all ], - [ qw/1 0 0 0/ ], - 'got artist tree with nocycle (CONNECT_BY_ISCYCLE)', - ); - - - is_same_sql_bind ( - $rs->count_rs->as_query, - '( - SELECT COUNT( * ) - FROM artist me - START WITH name = ? - CONNECT BY NOCYCLE parentid = PRIOR artistid - )', - [ [ name => 'cycle-root'] ], - ); - - is( $rs->count, 4, 'Connect By Nocycle count ok' ); - } -} + $art_rs->delete; + lives_ok { + $pop_rs->populate([ + map { +{ name => "pop_art_$_" } } + (1,2,3) + ]); + + is_deeply ( + [ $pop_rs->get_column('artistid')->all ], + [ map { $seq_pos + $_ } (1,2,3) ], + 'Sequence works after empty-table insertion' + ); + } 'Populate without identity does not throw'; + + lives_ok { + $pop_rs->populate([ + map { +{ artistid => $_, name => "pop_art_$_" } } + (1,2,3) + ]); + + is_deeply ( + [ $pop_rs->get_column('artistid')->all ], + [ 1,2,3, map { $seq_pos + $_ } (1,2,3) ], + 'Explicit id population works' + ); + } 'Populate with identity does not throw'; + + throws_ok { + $pop_rs->populate([ + map { +{ artistid => $_, name => "pop_art_$_" } } + (200, 1, 300) + ]); + } qr/unique constraint.+populate slice.+name => "pop_art_1"/s, 'Partially failed populate throws'; + + is_deeply ( + [ $pop_rs->get_column('artistid')->all ], + [ 1,2,3, map { $seq_pos + $_ } (1,2,3) ], + 'Partially failed populate did not alter table contents' + ); -my $schema2; +# test complex join (exercise orajoins) + lives_ok { is_deeply ( + $schema->resultset('CD')->search( + { 'artist.name' => 'pop_art_1', 'me.cdid' => { '!=', 999} }, + { join => 'artist', prefetch => 'tracks', rows => 4, order_by => 'tracks.trackid' } + )->all_hri, + [{ + artist => 1, + cdid => 1, + genreid => undef, + single_track => undef, + title => "EP C", + tracks => [ + { + cd => 1, + last_updated_at => undef, + last_updated_on => undef, + position => 1, + title => "Track1", + trackid => 1 + }, + { + cd => 1, + last_updated_at => undef, + last_updated_on => undef, + position => 1, + title => "Track2", + trackid => 2 + }, + ], + year => 2003 + }], + 'Correct set of data prefetched', + ) } 'complex prefetch ok'; # test sequence detection from a different schema -SKIP: { - skip ((join '', -'Set DBICTEST_ORA_EXTRAUSER_DSN, _USER and _PASS to a *DIFFERENT* Oracle user', -' to run the cross-schema autoincrement test.'), + SKIP: { + TODO: { + skip ((join '', + 'Set DBICTEST_ORA_EXTRAUSER_DSN, _USER and _PASS to a *DIFFERENT* Oracle user', + ' to run the cross-schema sequence detection test.'), 1) unless $dsn2 && $user2 && $user2 ne $user; - $schema2 = DBICTest::Schema->connect($dsn2, $user2, $pass2); + skip 'not detecting cross-schema sequence name when using INSERT ... RETURNING', 1 + if $schema->storage->_use_insert_returning; - my $schema1_dbh = $schema->storage->dbh; + # Oracle8i Reference Release 2 (8.1.6) + # http://download.oracle.com/docs/cd/A87860_01/doc/server.817/a76961/ch294.htm#993 + # Oracle Database Reference 10g Release 2 (10.2) + # http://download.oracle.com/docs/cd/B19306_01/server.102/b14237/statviews_2107.htm#sthref1297 + todo_skip "FIXME: On Oracle8i all_triggers view is empty, i don't yet know why...", 1 + if $schema->storage->_server_info->{normalized_dbms_version} < 9; - $schema1_dbh->do("GRANT INSERT ON artist TO $user2"); - $schema1_dbh->do("GRANT SELECT ON artist_seq TO $user2"); + my $schema2 = $schema->connect($dsn2, $user2, $pass2, $opt); + my $dbh2 = $schema2->storage->dbh; - my $rs = $schema2->resultset('ArtistFQN'); + # create identically named tables/sequences in the other schema + do_creates($dbh2, $q); - # first test with unquoted (default) sequence name in trigger body + # grant select privileges to the 2nd user + $dbh->do("GRANT INSERT ON ${q}artist${q} TO " . uc $user2); + $dbh->do("GRANT SELECT ON ${q}artist${q} TO " . uc $user2); + $dbh->do("GRANT SELECT ON ${q}artist_pk_seq${q} TO " . uc $user2); + $dbh->do("GRANT SELECT ON ${q}artist_autoinc_seq${q} TO " . uc $user2); - lives_and { - my $row = $rs->create({ name => 'From Different Schema' }); - ok $row->artistid; - } 'used autoinc sequence across schemas'; + # test with a fully qualified table (user1/schema prepended) + my $rs2 = $schema2->resultset('ArtistFQN'); + delete $rs2->result_source->column_info('artistid')->{sequence}; - # now quote the sequence name + lives_and { + my $row = $rs2->create({ name => 'From Different Schema' }); + ok $row->artistid; + } 'used autoinc sequence across schemas'; + + # now quote the sequence name (do_creates always uses an lc name) + my $q_seq = $q + ? '"artist_pk_seq"' + : '"ARTIST_PK_SEQ"' + ; + delete $rs2->result_source->column_info('artistid')->{sequence}; + $dbh->do(qq{ + CREATE OR REPLACE TRIGGER ${q}artist_insert_trg_pk${q} + BEFORE INSERT ON ${q}artist${q} + FOR EACH ROW + BEGIN + IF :new.${q}artistid${q} IS NULL THEN + SELECT $q_seq.nextval + INTO :new.${q}artistid${q} + FROM DUAL; + END IF; + END; + }); - $schema1_dbh->do(qq{ - CREATE OR REPLACE TRIGGER artist_insert_trg - BEFORE INSERT ON artist - FOR EACH ROW - BEGIN - IF :new.artistid IS NULL THEN - SELECT "ARTIST_SEQ".nextval - INTO :new.artistid - FROM DUAL; - END IF; - END; - }); - # sequence is cached in the rsrc - delete $rs->result_source->column_info('artistid')->{sequence}; + lives_and { + my $row = $rs2->create({ name => 'From Different Schema With Quoted Sequence' }); + ok $row->artistid; + } 'used quoted autoinc sequence across schemas'; + + is_deeply $rs2->result_source->column_info('artistid')->{sequence}, + \( (uc $user) . ".$q_seq"), + 'quoted sequence name correctly extracted'; - lives_and { - my $row = $rs->create({ name => 'From Different Schema With Quoted Sequence' }); - ok $row->artistid; - } 'used quoted autoinc sequence across schemas'; + # try an insert operation on the default user2 artist + my $art1 = $schema->resultset('Artist'); + my $art2 = $schema2->resultset('Artist'); + my $art1_count = $art1->count || 0; + my $art2_count = $art2->count; + + is( $art2_count, 0, 'No artists created yet in second schema' ); + + delete $art2->result_source->column_info('artistid')->{sequence}; + my $new_art = $art2->create({ name => '2nd best' }); + + is ($art1->count, $art1_count, 'No new rows in main schema'); + is ($art2->count, 1, 'One artist create in 2nd schema'); - my $schema_name = uc $user; + is( $new_art->artistid, 1, 'Expected first PK' ); - is $rs->result_source->column_info('artistid')->{sequence}, - qq[${schema_name}."ARTIST_SEQ"], - 'quoted sequence name correctly extracted'; + do_clean ($dbh2); + }} + +# test driver determination issues that led to the diagnosis/fix in 37b5ab51 +# observed side-effect when count-is-first on a fresh env-based connect + { + local $ENV{DBI_DSN}; + ($ENV{DBI_DSN}, my @user_pass_args) = @{ $schema->storage->connect_info }; + my $s2 = DBICTest::Schema->connect( undef, @user_pass_args ); + ok (! $s2->storage->connected, 'Not connected' ); + is (ref $s2->storage, 'DBIx::Class::Storage::DBI', 'Undetermined driver' ); + + ok ( + $s2->resultset('Artist')->search({ 'me.name' => { like => '%' } }, { prefetch => 'cds' })->count, + 'Some artist count' + ); + ok ( + scalar $s2->resultset('CD')->search({}, { join => 'tracks' } )->all, + 'Some cds returned' + ); + $s2->storage->disconnect; + } + + do_clean ($dbh); } done_testing; sub do_creates { - my $dbh = shift; - - eval { - $dbh->do("DROP SEQUENCE artist_autoinc_seq"); - $dbh->do("DROP SEQUENCE artist_pk_seq"); - $dbh->do("DROP SEQUENCE cd_seq"); - $dbh->do("DROP SEQUENCE track_seq"); - $dbh->do("DROP SEQUENCE pkid1_seq"); - $dbh->do("DROP SEQUENCE pkid2_seq"); - $dbh->do("DROP SEQUENCE nonpkid_seq"); - $dbh->do("DROP TABLE artist"); - $dbh->do("DROP TABLE sequence_test"); - $dbh->do("DROP TABLE track"); - $dbh->do("DROP TABLE cd"); - }; - $dbh->do("CREATE SEQUENCE artist_autoinc_seq START WITH 1 MAXVALUE 999999 MINVALUE 0"); - $dbh->do("CREATE SEQUENCE artist_pk_seq START WITH 1 MAXVALUE 999999 MINVALUE 0"); - $dbh->do("CREATE SEQUENCE cd_seq START WITH 1 MAXVALUE 999999 MINVALUE 0"); - $dbh->do("CREATE SEQUENCE track_seq START WITH 1 MAXVALUE 999999 MINVALUE 0"); - $dbh->do("CREATE SEQUENCE pkid1_seq START WITH 1 MAXVALUE 999999 MINVALUE 0"); + my ($dbh, $q) = @_; + + do_clean($dbh); + + $dbh->do("CREATE SEQUENCE ${q}artist_autoinc_seq${q} START WITH 1 MAXVALUE 999999 MINVALUE 0"); + $dbh->do("CREATE SEQUENCE ${q}artist_pk_seq${q} START WITH 1 MAXVALUE 999999 MINVALUE 0"); + $dbh->do("CREATE SEQUENCE ${q}cd_seq${q} START WITH 1 MAXVALUE 999999 MINVALUE 0"); + $dbh->do("CREATE SEQUENCE ${q}track_seq${q} START WITH 1 MAXVALUE 999999 MINVALUE 0"); + + $dbh->do("CREATE SEQUENCE ${q}nonpkid_seq${q} START WITH 20 MAXVALUE 999999 MINVALUE 0"); + # this one is always quoted as per manually specified sequence => + $dbh->do('CREATE SEQUENCE "pkid1_seq" START WITH 1 MAXVALUE 999999 MINVALUE 0'); + # this one is always unquoted as per manually specified sequence => $dbh->do("CREATE SEQUENCE pkid2_seq START WITH 10 MAXVALUE 999999 MINVALUE 0"); - $dbh->do("CREATE SEQUENCE nonpkid_seq START WITH 20 MAXVALUE 999999 MINVALUE 0"); - $dbh->do("CREATE TABLE artist (artistid NUMBER(12), parentid NUMBER(12), name VARCHAR(255), autoinc_col NUMBER(12), rank NUMBER(38), charfield VARCHAR2(10))"); - $dbh->do("ALTER TABLE artist ADD (CONSTRAINT artist_pk PRIMARY KEY (artistid))"); + $dbh->do("CREATE TABLE ${q}artist${q} (${q}artistid${q} NUMBER(12), ${q}name${q} VARCHAR(255),${q}default_value_col${q} VARCHAR(255) DEFAULT 'default_value', ${q}autoinc_col${q} NUMBER(12), ${q}rank${q} NUMBER(38), ${q}charfield${q} VARCHAR2(10))"); + $dbh->do("ALTER TABLE ${q}artist${q} ADD (CONSTRAINT ${q}artist_pk${q} PRIMARY KEY (${q}artistid${q}))"); - $dbh->do("CREATE TABLE sequence_test (pkid1 NUMBER(12), pkid2 NUMBER(12), nonpkid NUMBER(12), name VARCHAR(255))"); - $dbh->do("ALTER TABLE sequence_test ADD (CONSTRAINT sequence_test_constraint PRIMARY KEY (pkid1, pkid2))"); + $dbh->do("CREATE TABLE ${q}sequence_test${q} (${q}pkid1${q} NUMBER(12), ${q}pkid2${q} NUMBER(12), ${q}nonpkid${q} NUMBER(12), ${q}name${q} VARCHAR(255))"); + $dbh->do("ALTER TABLE ${q}sequence_test${q} ADD (CONSTRAINT ${q}sequence_test_constraint${q} PRIMARY KEY (${q}pkid1${q}, ${q}pkid2${q}))"); - $dbh->do("CREATE TABLE cd (cdid NUMBER(12), artist NUMBER(12), title VARCHAR(255), year VARCHAR(4), genreid NUMBER(12), single_track NUMBER(12))"); - $dbh->do("ALTER TABLE cd ADD (CONSTRAINT cd_pk PRIMARY KEY (cdid))"); + # table cd will be unquoted => Oracle will see it as uppercase + $dbh->do("CREATE TABLE cd (${q}cdid${q} NUMBER(12), ${q}artist${q} NUMBER(12), ${q}title${q} VARCHAR(255), ${q}year${q} VARCHAR(4), ${q}genreid${q} NUMBER(12), ${q}single_track${q} NUMBER(12))"); + $dbh->do("ALTER TABLE cd ADD (CONSTRAINT ${q}cd_pk${q} PRIMARY KEY (${q}cdid${q}))"); - $dbh->do("CREATE TABLE track (trackid NUMBER(12), cd NUMBER(12) REFERENCES cd(cdid) DEFERRABLE, position NUMBER(12), title VARCHAR(255), last_updated_on DATE, last_updated_at DATE, small_dt DATE)"); - $dbh->do("ALTER TABLE track ADD (CONSTRAINT track_pk PRIMARY KEY (trackid))"); + $dbh->do("CREATE TABLE ${q}track${q} (${q}trackid${q} NUMBER(12), ${q}cd${q} NUMBER(12) REFERENCES CD(${q}cdid${q}) DEFERRABLE, ${q}position${q} NUMBER(12), ${q}title${q} VARCHAR(255), ${q}last_updated_on${q} DATE, ${q}last_updated_at${q} DATE)"); + $dbh->do("ALTER TABLE ${q}track${q} ADD (CONSTRAINT ${q}track_pk${q} PRIMARY KEY (${q}trackid${q}))"); $dbh->do(qq{ - CREATE OR REPLACE TRIGGER artist_insert_trg_auto - BEFORE INSERT ON artist + CREATE OR REPLACE TRIGGER ${q}artist_insert_trg_auto${q} + BEFORE INSERT ON ${q}artist${q} FOR EACH ROW BEGIN - IF :new.autoinc_col IS NULL THEN - SELECT artist_autoinc_seq.nextval - INTO :new.autoinc_col + IF :new.${q}autoinc_col${q} IS NULL THEN + SELECT ${q}artist_autoinc_seq${q}.nextval + INTO :new.${q}autoinc_col${q} FROM DUAL; END IF; END; }); + $dbh->do(qq{ - CREATE OR REPLACE TRIGGER artist_insert_trg_pk - BEFORE INSERT ON artist + CREATE OR REPLACE TRIGGER ${q}artist_insert_trg_pk${q} + BEFORE INSERT ON ${q}artist${q} FOR EACH ROW BEGIN - IF :new.artistid IS NULL THEN - SELECT artist_pk_seq.nextval - INTO :new.artistid + IF :new.${q}artistid${q} IS NULL THEN + SELECT ${q}artist_pk_seq${q}.nextval + INTO :new.${q}artistid${q} FROM DUAL; END IF; END; }); + $dbh->do(qq{ - CREATE OR REPLACE TRIGGER cd_insert_trg + CREATE OR REPLACE TRIGGER ${q}cd_insert_trg${q} BEFORE INSERT OR UPDATE ON cd FOR EACH ROW + + DECLARE + tmpVar NUMBER; + BEGIN - IF :new.cdid IS NULL THEN - SELECT cd_seq.nextval - INTO :new.cdid - FROM DUAL; - END IF; - END; - }); - $dbh->do(qq{ - CREATE OR REPLACE TRIGGER cd_insert_trg - BEFORE INSERT ON cd - FOR EACH ROW - BEGIN - IF :new.cdid IS NULL THEN - SELECT cd_seq.nextval - INTO :new.cdid - FROM DUAL; + tmpVar := 0; + + IF :new.${q}cdid${q} IS NULL THEN + SELECT ${q}cd_seq${q}.nextval + INTO tmpVar + FROM dual; + + :new.${q}cdid${q} := tmpVar; END IF; END; }); + $dbh->do(qq{ - CREATE OR REPLACE TRIGGER track_insert_trg - BEFORE INSERT ON track + CREATE OR REPLACE TRIGGER ${q}track_insert_trg${q} + BEFORE INSERT ON ${q}track${q} FOR EACH ROW BEGIN - IF :new.trackid IS NULL THEN - SELECT track_seq.nextval - INTO :new.trackid + IF :new.${q}trackid${q} IS NULL THEN + SELECT ${q}track_seq${q}.nextval + INTO :new.${q}trackid${q} FROM DUAL; END IF; END; @@ -834,21 +666,39 @@ sub do_creates { } # clean up our mess +sub do_clean { + + my $dbh = shift || return; + + for my $q ('', '"') { + my @clean = ( + "DROP TRIGGER ${q}track_insert_trg${q}", + "DROP TRIGGER ${q}cd_insert_trg${q}", + "DROP TRIGGER ${q}artist_insert_trg_auto${q}", + "DROP TRIGGER ${q}artist_insert_trg_pk${q}", + "DROP SEQUENCE ${q}nonpkid_seq${q}", + "DROP SEQUENCE ${q}pkid2_seq${q}", + "DROP SEQUENCE ${q}pkid1_seq${q}", + "DROP SEQUENCE ${q}track_seq${q}", + "DROP SEQUENCE ${q}cd_seq${q}", + "DROP SEQUENCE ${q}artist_autoinc_seq${q}", + "DROP SEQUENCE ${q}artist_pk_seq${q}", + "DROP TABLE ${q}bindtype_test${q}", + "DROP TABLE ${q}sequence_test${q}", + "DROP TABLE ${q}track${q}", + "DROP TABLE ${q}cd${q}", + "DROP TABLE ${q}artist${q}", + ); + eval { $dbh -> do ($_) } for @clean; + } +} + END { - for my $dbh (map $_->storage->dbh, grep $_, ($schema, $schema2)) { - eval { - $dbh->do("DROP SEQUENCE artist_autoinc_seq"); - $dbh->do("DROP SEQUENCE artist_pk_seq"); - $dbh->do("DROP SEQUENCE cd_seq"); - $dbh->do("DROP SEQUENCE track_seq"); - $dbh->do("DROP SEQUENCE pkid1_seq"); - $dbh->do("DROP SEQUENCE pkid2_seq"); - $dbh->do("DROP SEQUENCE nonpkid_seq"); - $dbh->do("DROP TABLE artist"); - $dbh->do("DROP TABLE sequence_test"); - $dbh->do("DROP TABLE track"); - $dbh->do("DROP TABLE cd"); - $dbh->do("DROP TABLE bindtype_test"); - }; + for ($dbh, $dbh2) { + next unless $_; + local $SIG{__WARN__} = sub {}; + do_clean($_); } + undef $dbh; + undef $dbh2; }