X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FOracle.pm;h=957b00a89bc677090bc0132f87cd9085633011d6;hb=b1ad1a8402a5eb0955c6b76310809c2ab29291a9;hp=ce9d96bc2d7deb9ede6a867cb060b0f854c848f2;hpb=b327622ba07a243c4b5e10b0b7dbd17c20d75b34;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm b/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm index ce9d96b..957b00a 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm @@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI'; use Carp::Clan qw/^DBIx::Class/; use Class::C3; -our $VERSION = '0.04999_05'; +our $VERSION = '0.04999_10'; =head1 NAME @@ -78,14 +78,14 @@ sub _table_uniq_info { my $sth = $dbh->prepare_cached( q{ - SELECT constraint_name, ucc.column_name - FROM user_constraints JOIN user_cons_columns ucc USING (constraint_name) - WHERE ucc.table_name=? AND constraint_type='U' - ORDER BY ucc.position + SELECT constraint_name, acc.column_name + FROM all_constraints JOIN all_cons_columns acc USING (constraint_name) + WHERE acc.table_name=? and acc.owner = ? AND constraint_type='U' + ORDER BY acc.position }, {}, 1); - $sth->execute(uc $table); + $sth->execute(uc $table,$self->{db_schema} ); my %constr_names; while(my $constr = $sth->fetchrow_arrayref) { my $constr_name = lc $constr->[0]; @@ -131,8 +131,8 @@ sub _extra_column_info { my $sth = $dbh->prepare_cached( q{ SELECT COUNT(*) - FROM user_triggers ut JOIN user_trigger_cols utc USING (trigger_name) - WHERE utc.table_name = ? AND utc.column_name = ? + FROM all_triggers ut JOIN all_trigger_cols atc USING (trigger_name) + WHERE atc.table_name = ? AND atc.column_name = ? AND column_usage LIKE '%NEW%' AND column_usage LIKE '%OUT%' AND trigger_type = 'BEFORE EACH ROW' AND triggering_event LIKE '%INSERT%' },