From: Johannes Plunien Date: Sun, 15 Feb 2009 14:20:25 +0000 (+0000) Subject: RT#38251: DBIx::Class::Storage::DBI::Oracle::Generic does not handle fully-qualified... X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=cb464582b5b4b166017d904931804227431f9582;p=dbsrgits%2FDBIx-Class-Historic.git RT#38251: DBIx::Class::Storage::DBI::Oracle::Generic does not handle fully-qualified table names --- diff --git a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm index cb5d62b..bbefa4d 100644 --- a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm +++ b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm @@ -55,8 +55,23 @@ sub _dbh_get_autoinc_seq { # trigger_body is a LONG $dbh->{LongReadLen} = 64 * 1024 if ($dbh->{LongReadLen} < 64 * 1024); - my $sth = $dbh->prepare($sql); - $sth->execute( uc($source->name) ); + my $sth; + + # check for fully-qualified name (eg. SCHEMA.TABLENAME) + if ( my ( $schema, $table ) = $source->name =~ /(\w+)\.(\w+)/ ) { + $sql = q{ + SELECT trigger_body FROM ALL_TRIGGERS t + WHERE t.owner = ? AND t.table_name = ? + AND t.triggering_event = 'INSERT' + AND t.status = 'ENABLED' + }; + $sth = $dbh->prepare($sql); + $sth->execute( uc($schema), uc($table) ); + } + else { + $sth = $dbh->prepare($sql); + $sth->execute( uc( $source->name ) ); + } while (my ($insert_trigger) = $sth->fetchrow_array) { return uc($1) if $insert_trigger =~ m!(\w+)\.nextval!i; # col name goes here??? } diff --git a/t/73oracle.t b/t/73oracle.t index 12929b6..306ad50 100644 --- a/t/73oracle.t +++ b/t/73oracle.t @@ -1,3 +1,30 @@ +{ + 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; @@ -12,8 +39,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 => 24; +DBICTest::Schema->load_classes('ArtistFQN'); my $schema = DBICTest::Schema->connect($dsn, $user, $pass); my $dbh = $schema->storage->dbh; @@ -62,6 +90,10 @@ $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' }); @@ -90,7 +122,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" );