package DBIx::Class::UUIDColumns;
-
use strict;
use warnings;
-
use vars qw($VERSION);
-use base qw/DBIx::Class/;
-__PACKAGE__->mk_classdata( 'uuid_auto_columns' => [] );
-__PACKAGE__->mk_classdata( 'uuid_maker' );
-__PACKAGE__->uuid_class( __PACKAGE__->_find_uuid_module );
+BEGIN {
+ use base qw/DBIx::Class Class::Accessor::Grouped/;
+
+ __PACKAGE__->mk_group_accessors('inherited', qw/uuid_auto_columns uuid_maker/);
+};
+__PACKAGE__->uuid_class(__PACKAGE__->_find_uuid_module);
# Always remember to do all digits for the version even if they're 0
# i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports
# brain damage and presumably various other packaging systems too
-$VERSION = '0.01000';
+$VERSION = '0.02004';
sub uuid_columns {
my $self = shift;
- for (@_) {
- $self->throw_exception("column $_ doesn't exist") unless $self->has_column($_);
- }
- $self->uuid_auto_columns(\@_);
+
+ if (scalar @_) {
+ for (@_) {
+ $self->throw_exception("column $_ doesn't exist") unless $self->has_column($_);
+ }
+ $self->uuid_auto_columns(\@_);
+ };
+
+ return $self->uuid_auto_columns || [];
}
sub uuid_class {
sub insert {
my $self = shift;
- for my $column (@{$self->uuid_auto_columns}) {
+ for my $column (@{$self->uuid_columns}) {
$self->store_column( $column, $self->get_uuid )
unless defined $self->get_column( $column );
}
sub _find_uuid_module {
if (eval{require Data::UUID}) {
return '::Data::UUID';
+ } elsif (eval{require Data::GUID}) {
+ return '::Data::GUID';
} elsif ($^O ne 'openbsd' && eval{require APR::UUID}) {
# APR::UUID on openbsd causes some as yet unfound nastiness for XS
return '::APR::UUID';
=head2 uuid_columns
-Takes a list of columns to be filled with uuids during insert.
+Gets/sets the list of columns to be filled with uuids during insert.
__PACKAGE__->uuid_columns('artist_id');
__PACKAGE__->uuid_class('::Data::UUID');
# loads DBIx::Class::UUIDMaker::Data::UUID;
-Note that C<uuid_class> chacks to see that the specified class isa
-L<DBIx::Class::UUIDColumns::UUIDMaker> subbclass and throws and exception if it isn't.
+Note that C<uuid_class> checks to see that the specified class isa
+L<DBIx::Class::UUIDColumns::UUIDMaker> subclass and throws and exception if it isn't.
=head2 uuid_maker