X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FOracle%2FGeneric.pm;h=b255e537c8ade48fd619f578218c89b6c2b1e6b1;hb=07cda1c5a7df6656772dfd65c488c19c15126168;hp=95e428db515df99da9917e4a8de007fb953ff36f;hpb=25ca709b095f6f33043eaf056b34720f2334a04d;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm index 95e428d..b255e53 100644 --- a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm +++ b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm @@ -3,7 +3,11 @@ package DBIx::Class::Storage::DBI::Oracle::Generic; use strict; use warnings; use Scope::Guard (); -use Context::Preserve (); +use Context::Preserve 'preserve_context'; +use Try::Tiny; +use namespace::clean; + +__PACKAGE__->sql_limit_dialect ('RowNum'); =head1 NAME @@ -15,7 +19,6 @@ DBIx::Class::Storage::DBI::Oracle::Generic - Oracle Support for DBIx::Class use base 'DBIx::Class::Core'; __PACKAGE__->add_columns({ id => { sequence => 'mysequence', auto_nextval => 1 } }); __PACKAGE__->set_primary_key('id'); - __PACKAGE__->sequence('mysequence'); # Somewhere in your Code # add some data to a table with a hierarchical relationship @@ -44,7 +47,7 @@ DBIx::Class::Storage::DBI::Oracle::Generic - Oracle Support for DBIx::Class my $rs = $schema->resultset('Person')->search({}, { 'start_with' => { 'firstname' => 'foo', 'lastname' => 'bar' }, - 'connect_by' => { 'parentid' => { '-prior' => \'persionid' }, + 'connect_by' => { 'parentid' => { '-prior' => { -ident => 'personid' } }, 'order_siblings_by' => { -asc => 'name' }, }; ); @@ -58,7 +61,7 @@ DBIx::Class::Storage::DBI::Oracle::Generic - Oracle Support for DBIx::Class # START WITH # firstname = 'foo' and lastname = 'bar' # CONNECT BY - # parentid = prior persionid + # parentid = prior personid # ORDER SIBLINGS BY # firstname ASC @@ -75,7 +78,7 @@ versions before 9. use base qw/DBIx::Class::Storage::DBI/; use mro 'c3'; -__PACKAGE__->sql_maker_class('DBIx::Class::SQLAHacks::Oracle'); +__PACKAGE__->sql_maker_class('DBIx::Class::SQLMaker::Oracle'); sub deployment_statements { my $self = shift;; @@ -86,9 +89,13 @@ sub deployment_statements { $sqltargs->{quote_table_names} = $quote_char ? 1 : 0; $sqltargs->{quote_field_names} = $quote_char ? 1 : 0; - my $oracle_version = eval { $self->_get_dbh->get_info(18) }; - - $sqltargs->{producer_args}{oracle_version} = $oracle_version; + if ( + ! exists $sqltargs->{producer_args}{oracle_version} + and + my $dver = $self->_server_info->{dbms_version} + ) { + $sqltargs->{producer_args}{oracle_version} = $dver; + } $self->next::method($schema, $type, $version, $dir, $sqltargs, @rest); } @@ -98,7 +105,7 @@ sub _dbh_last_insert_id { my @ids = (); foreach my $col (@columns) { my $seq = ($source->column_info($col)->{sequence} ||= $self->get_autoinc_seq($source,$col)); - my $id = $self->_sequence_fetch( 'currval', $seq ); + my $id = $self->_sequence_fetch( 'CURRVAL', $seq ); push @ids, $id; } return @ids; @@ -108,15 +115,20 @@ sub _dbh_get_autoinc_seq { my ($self, $dbh, $source, $col) = @_; my $sql_maker = $self->sql_maker; + my ($ql, $qr) = map { $_ ? (quotemeta $_) : '' } $sql_maker->_quote_chars; my $source_name; if ( ref $source->name eq 'SCALAR' ) { $source_name = ${$source->name}; + + # the ALL_TRIGGERS match further on is case sensitive - thus uppercase + # stuff unless it is already quoted + $source_name = uc ($source_name) if $source_name !~ /\"/; } else { $source_name = $source->name; + $source_name = uc($source_name) unless $ql; } - $source_name = uc($source_name) unless $sql_maker->quote_char; # trigger_body is a LONG local $dbh->{LongReadLen} = 64 * 1024 if ($dbh->{LongReadLen} < 64 * 1024); @@ -124,30 +136,103 @@ sub _dbh_get_autoinc_seq { # disable default bindtype local $sql_maker->{bindtype} = 'normal'; + # look up the correct sequence automatically - my ( $schema, $table ) = $source_name =~ /(\w+)\.(\w+)/; + my ( $schema, $table ) = $source_name =~ /( (?:${ql})? \w+ (?:${qr})? ) \. ( (?:${ql})? \w+ (?:${qr})? )/x; my ($sql, @bind) = $sql_maker->select ( 'ALL_TRIGGERS', - ['trigger_body'], + [qw/TRIGGER_BODY TABLE_OWNER TRIGGER_NAME/], { - $schema ? (owner => $schema) : (), - table_name => $table || $source_name, - triggering_event => 'INSERT', - status => 'ENABLED', + $schema ? (OWNER => $schema) : (), + TABLE_NAME => $table || $source_name, + TRIGGERING_EVENT => { -like => '%INSERT%' }, # this will also catch insert_or_update + TRIGGER_TYPE => { -like => '%BEFORE%' }, # we care only about 'before' triggers + STATUS => 'ENABLED', }, ); - my $sth = $dbh->prepare($sql); - $sth->execute (@bind); - while (my ($insert_trigger) = $sth->fetchrow_array) { - return $1 if $insert_trigger =~ m!("?\w+"?)\.nextval!i; # col name goes here??? + # to find all the triggers that mention the column in question a simple + # regex grep since the trigger_body above is a LONG and hence not searchable + my @triggers = ( map + { my %inf; @inf{qw/body schema name/} = @$_; \%inf } + ( grep + { $_->[0] =~ /\:new\.${ql}${col}${qr} | \:new\.$col/xi } + @{ $dbh->selectall_arrayref( $sql, {}, @bind ) } + ) + ); + + # extract all sequence names mentioned in each trigger + for (@triggers) { + $_->{sequences} = [ $_->{body} =~ / ( "? [\.\w\"\-]+ "? ) \. nextval /xig ]; } - $self->throw_exception("Unable to find a sequence INSERT trigger on table '$source_name'."); + + my $chosen_trigger; + + # if only one trigger matched things are easy + if (@triggers == 1) { + + if ( @{$triggers[0]{sequences}} == 1 ) { + $chosen_trigger = $triggers[0]; + } + else { + $self->throw_exception( sprintf ( + "Unable to introspect trigger '%s' for column %s.%s (references multiple sequences). " + . "You need to specify the correct 'sequence' explicitly in '%s's column_info.", + $triggers[0]{name}, + $source_name, + $col, + $col, + ) ); + } + } + # got more than one matching trigger - see if we can narrow it down + elsif (@triggers > 1) { + + my @candidates = grep + { $_->{body} =~ / into \s+ \:new\.$col /xi } + @triggers + ; + + if (@candidates == 1 && @{$candidates[0]{sequences}} == 1) { + $chosen_trigger = $candidates[0]; + } + else { + $self->throw_exception( sprintf ( + "Unable to reliably select a BEFORE INSERT trigger for column %s.%s (possibilities: %s). " + . "You need to specify the correct 'sequence' explicitly in '%s's column_info.", + $source_name, + $col, + ( join ', ', map { "'$_->{name}'" } @triggers ), + $col, + ) ); + } + } + + if ($chosen_trigger) { + my $seq_name = $chosen_trigger->{sequences}[0]; + + $seq_name = "$chosen_trigger->{schema}.$seq_name" + unless $seq_name =~ /\./; + + return \$seq_name if $seq_name =~ /\"/; # may already be quoted in-trigger + return $seq_name; + } + + $self->throw_exception( sprintf ( + "No suitable BEFORE INSERT triggers found for column %s.%s. " + . "You need to specify the correct 'sequence' explicitly in '%s's column_info.", + $source_name, + $col, + $col, + )); } sub _sequence_fetch { my ( $self, $type, $seq ) = @_; - my ($id) = $self->_get_dbh->selectrow_array("SELECT ${seq}.${type} FROM DUAL"); + + # use the maker to leverage quoting settings + my $sql_maker = $self->sql_maker; + my ($id) = $self->_get_dbh->selectrow_array ($sql_maker->select('DUAL', [ ref $seq ? \"$$seq.$type" : "$seq.$type" ] ) ); return $id; } @@ -157,46 +242,53 @@ sub _ping { my $dbh = $self->_dbh or return 0; local $dbh->{RaiseError} = 1; + local $dbh->{PrintError} = 0; - eval { - $dbh->do("select 1 from dual"); + return try { + $dbh->do('select 1 from dual'); + 1; + } catch { + 0; }; - - return $@ ? 0 : 1; } sub _dbh_execute { my $self = shift; my ($dbh, $op, $extra_bind, $ident, $bind_attributes, @args) = @_; - my $wantarray = wantarray; - - my (@res, $exception, $retried); - - RETRY: { - do { - eval { - if ($wantarray) { - @res = $self->next::method(@_); - } else { - $res[0] = $self->next::method(@_); - } - }; - $exception = $@; - if ($exception =~ /ORA-01003/) { + my (@res, $tried); + my $wantarray = wantarray(); + my $next = $self->next::can; + do { + try { + my $exec = sub { $self->$next($dbh, $op, $extra_bind, $ident, $bind_attributes, @args) }; + + if (!defined $wantarray) { + $exec->(); + } + elsif (! $wantarray) { + $res[0] = $exec->(); + } + else { + @res = $exec->(); + } + + $tried++; + } + catch { + if (! $tried and $_ =~ /ORA-01003/) { # ORA-01003: no statement parsed (someone changed the table somehow, # invalidating your cursor.) my ($sql, $bind) = $self->_prep_for_execute($op, $extra_bind, $ident, \@args); delete $dbh->{CachedKids}{$sql}; - } else { - last RETRY; } - } while (not $retried++); - } - - $self->throw_exception($exception) if $exception; + else { + $self->throw_exception($_); + } + }; + } while (! $tried++); - $wantarray ? @res : $res[0] + return $wantarray ? @res : $res[0]; } =head2 get_autoinc_seq @@ -211,19 +303,6 @@ sub get_autoinc_seq { $self->dbh_do('_dbh_get_autoinc_seq', $source, $col); } -=head2 columns_info_for - -This wraps the superclass version of this method to force table -names to uppercase - -=cut - -sub columns_info_for { - my ($self, $table) = @_; - - $self->next::method($table); -} - =head2 datetime_parser_type This sets the proper DateTime::Format module for use with @@ -239,10 +318,10 @@ Used as: on_connect_call => 'datetime_setup' -In L to set the session nls date, and -timestamp values for use with L and the -necessary environment variables for L, which is used -by it. +In L to set the session nls +date, and timestamp values for use with L +and the necessary environment variables for L, which +is used by it. Maximum allowable precision is used, unless the environment variables have already been set. @@ -307,8 +386,8 @@ sub source_bind_attributes my %bind_attributes; foreach my $column ($source->columns) { - my $data_type = $source->column_info($column)->{data_type} || ''; - next unless $data_type; + my $data_type = $source->column_info($column)->{data_type} + or next; my %column_bind_attrs = $self->bind_attribute_by_data_type($data_type); @@ -366,25 +445,7 @@ sub relname_to_table_alias { my $alias = $self->next::method(@_); - return $alias if length($alias) <= 30; - - # get a base64 md5 of the alias with join_count - require Digest::MD5; - my $ctx = Digest::MD5->new; - $ctx->add($alias); - my $md5 = $ctx->b64digest; - - # remove alignment mark just in case - $md5 =~ s/=*\z//; - - # truncate and prepend to truncated relname without vowels - (my $devoweled = $relname) =~ s/[aeiou]//g; - my $shortened = substr($devoweled, 0, 18); - - my $new_alias = - $shortened . '_' . substr($md5, 0, 30 - length($shortened) - 1); - - return $new_alias; + return $self->sql_maker->_shorten_identifier($alias, [$relname]); } =head2 with_deferred_fk_checks @@ -412,32 +473,15 @@ sub with_deferred_fk_checks { $self->_do_query('alter session set constraints = immediate'); }); - return Context::Preserve::preserve_context(sub { $sub->() }, - after => sub { $txn_scope_guard->commit }); -} - -sub _select_args { - my ($self, $ident, $select, $where, $attrs) = @_; - - my $connect_by_args = {}; - if ( $attrs->{connect_by} || $attrs->{start_with} || $attrs->{order_siblings_by} ) { - $connect_by_args = { - connect_by => $attrs->{connect_by}, - start_with => $attrs->{start_with}, - order_siblings_by => $attrs->{order_siblings_by}, - } - } - - my @rv = $self->next::method($ident, $select, $where, $attrs); - - return (@rv, $connect_by_args); + return + preserve_context { $sub->() } after => sub { $txn_scope_guard->commit }; } =head1 ATTRIBUTES Following additional attributes can be used in resultsets. -=head2 connect_by +=head2 connect_by or connect_by_nocycle =over 4 @@ -448,6 +492,7 @@ Following additional attributes can be used in resultsets. A hashref of conditions used to specify the relationship between parent rows and child rows of the hierarchy. + connect_by => { parentid => 'prior personid' } # adds a connect by statement to the query: @@ -457,6 +502,18 @@ and child rows of the hierarchy. # person me # CONNECT BY # parentid = prior persionid + + + connect_by_nocycle => { parentid => 'prior personid' } + + # adds a connect by statement to the query: + # SELECT + # me.persionid me.firstname, me.lastname, me.parentid + # FROM + # person me + # CONNECT BY NOCYCLE + # parentid = prior persionid + =head2 start_with