From: Matt S Trout Date: Sat, 18 Mar 2006 23:26:18 +0000 (+0000) Subject: Post-merge fixups X-Git-Tag: v0.06000~59 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3b24f6ea87d4339179f2752b661d85dd08827d8f;p=dbsrgits%2FDBIx-Class.git Post-merge fixups --- diff --git a/Changes b/Changes index 7e4682e..9ccebd1 100644 --- a/Changes +++ b/Changes @@ -59,6 +59,7 @@ Revision history for DBIx::Class keys of the related table are not fetched - fix count for group_by as scalar - add horrific fix to make Oracle's retarded limit syntax work + - remove Carp require - changed UUIDColumns to use new UUIDMaker classes for uuid creation using whatever module may be available diff --git a/lib/DBIx/Class/Schema.pm b/lib/DBIx/Class/Schema.pm index 33ac06e..21ae980 100644 --- a/lib/DBIx/Class/Schema.pm +++ b/lib/DBIx/Class/Schema.pm @@ -205,7 +205,9 @@ sub load_classes { my $comp_class = "${prefix}::${comp}"; eval "use $comp_class"; # If it fails, assume the user fixed it if ($@) { - die $@ unless $@ =~ /Can't locate/; + $comp_class =~ s/::/\//g; + die $@ unless $@ =~ /Can't locate.+$comp_class\.pm\sin\s\@INC/; + warn $@ if $@; } push(@to_register, [ $comp, $comp_class ]); } @@ -389,12 +391,13 @@ sub txn_rollback { shift->storage->txn_rollback } =head2 txn_do -=head3 Arguments: , [@coderef_args] +=head3 Arguments: <$coderef>, [@coderef_args] -Executes with (optional) arguments <@coderef_args> transactionally, -returning its result (if any). If an exception is caught, a rollback is issued -and the exception is rethrown. If the rollback fails, (i.e. throws an -exception) an exception is thrown that includes a "Rollback failed" message. +Executes C<$coderef> with (optional) arguments C<@coderef_args> +transactionally, returning its result (if any). If an exception is +caught, a rollback is issued and the exception is rethrown. If the +rollback fails, (i.e. throws an exception) an exception is thrown that +includes a "Rollback failed" message. For example, @@ -426,7 +429,7 @@ For example, } } -Nested transactions should work as expected (i.e. only the outermost +Nested transactions work as expected (i.e. only the outermost transaction will issue a txn_commit on the Schema's storage) =cut diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm index 6da680b..3a7d978 100644 --- a/lib/DBIx/Class/Storage/DBI.pm +++ b/lib/DBIx/Class/Storage/DBI.pm @@ -149,7 +149,16 @@ sub _join_condition { sub _quote { my ($self, $label) = @_; return '' unless defined $label; + return "*" if $label eq '*'; return $label unless $self->{quote_char}; + if(ref $self->{quote_char} eq "ARRAY"){ + return $self->{quote_char}->[0] . $label . $self->{quote_char}->[1] + if !defined $self->{name_sep}; + my $sep = $self->{name_sep}; + return join($self->{name_sep}, + map { $self->{quote_char}->[0] . $_ . $self->{quote_char}->[1] } + split(/\Q$sep\E/,$label)); + } return $self->SUPER::_quote($label); } diff --git a/lib/DBIx/Class/UUIDColumns.pm b/lib/DBIx/Class/UUIDColumns.pm index c15dd1a..8a58527 100644 --- a/lib/DBIx/Class/UUIDColumns.pm +++ b/lib/DBIx/Class/UUIDColumns.pm @@ -113,105 +113,6 @@ Takes a list of columns to be filled with uuids during insert. __PACKAGE__->uuid_columns('id'); -sub uuid_class { - my ($self, $class) = @_; - - if ($class) { - $class = "DBIx::Class::UUIDMaker$class" if $class =~ /^::/; - - if (!eval "require $class") { - $self->throw_exception("$class could not be loaded: $@"); - } elsif (!$class->isa('DBIx::Class::UUIDMaker')) { - $self->throw_exception("$class is not a UUIDMaker subclass"); - } else { - $self->uuid_maker($class->new); - }; - }; - - return ref $self->uuid_maker; -}; - -sub insert { - my $self = shift; - for my $column (@{$self->uuid_auto_columns}) { - $self->store_column( $column, $self->get_uuid ) - unless defined $self->get_column( $column ); - } - $self->next::method(@_); -} - -sub get_uuid { - return shift->uuid_maker->as_string; -} - -sub _find_uuid_module { - if (eval{require Data::UUID}) { - return '::Data::UUID'; - } elsif ($^O ne 'openbsd' && eval{require APR::UUID}) { - # APR::UUID on openbsd causes some as yet unfound nastyness for XS - return '::APR::UUID'; - } elsif (eval{require UUID}) { - return '::UUID'; - } elsif (eval{ - # squelch the 'too late for INIT' warning in Win32::API::Type - local $^W = 0; - require Win32::Guidgen; - }) { - return '::Win32::Guidgen'; - } elsif (eval{require Win32API::GUID}) { - return '::Win32API::GUID'; - } else { - shift->throw_exception('no suitable uuid module could be found') - }; -}; - -1; -__END__ - -=head1 NAME - -DBIx::Class::UUIDColumns - Implicit uuid columns - -=head1 SYNOPSIS - - package Artist; - __PACKAGE__->load_components(qw/UUIDColumns Core DB/); - __PACKAGE__->uuid_columns( 'artist_id' ); - -=head1 DESCRIPTION - -This L component resembles the behaviour of -L, to make some columns implicitly created as uuid. - -When loaded, C will search for a suitable uuid generation module -from the following list of supported modules: - - Data::UUID - APR::UUID* - UUID - Win32::Guidgen - Win32API::GUID - -If no supporting module can be found, an exception will be thrown. - -*APR::UUID will not be loaded under OpenBSD due to an as yet unidentified XS -issue. - -If you would like to use a specific module, you can set C: - - __PACKAGE__->uuid_class('::Data::UUID'); - __PACKAGE__->uuid_class('MyUUIDGenerator'); - -Note that the component needs to be loaded before Core. - -=head1 METHODS - -=head2 uuid_columns(@columns) - -Takes a list of columns to be filled with uuids during insert. - - __PACKAGE__->uuid_columns('id'); - =head2 uuid_class($classname) Takes the name of a UUIDMaker subclass to be used for uuid value generation.