X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema.pm;h=b2c977555c07652359876e5f2e1c2589fb46f1f1;hb=3b042bcbab344e8d94620d0d13360a605559f8b5;hp=4ec608d0fb7848ba98bdc527b71645f6250646dc;hpb=19feb86bd0beb518ffb5bcbfe3cf37d2cc9c1c21;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/Schema.pm b/lib/DBIx/Class/Schema.pm index 4ec608d..b2c9775 100644 --- a/lib/DBIx/Class/Schema.pm +++ b/lib/DBIx/Class/Schema.pm @@ -3,12 +3,10 @@ package DBIx::Class::Schema; use strict; use warnings; -use Carp qw/croak/; -use UNIVERSAL::require; +use Carp::Clan qw/^DBIx::Class/; use base qw/DBIx::Class/; -__PACKAGE__->load_components(qw/Exception/); __PACKAGE__->mk_classdata('class_mappings' => {}); __PACKAGE__->mk_classdata('source_registrations' => {}); __PACKAGE__->mk_classdata('storage_type' => '::DBI'); @@ -31,6 +29,7 @@ DBIx::Class::Schema - composable schemas __PACKAGE__->load_components(qw/PK::Auto::Pg Core/); # for example __PACKAGE__->table('foo'); + # Elsewhere in your code: my $schema1 = My::Schema->connect( $dsn, $user, @@ -56,7 +55,9 @@ particular which module inherits off which. =head1 METHODS -=head2 register_class +=head2 register_class + +=head3 Arguments: Registers a class which isa ResultSourceProxy; equivalent to calling @@ -69,7 +70,9 @@ sub register_class { $self->register_source($moniker => $to_register->result_source_instance); } -=head2 register_source +=head2 register_source + +=head3 Arguments: Registers the result source in the schema with the given moniker @@ -116,7 +119,7 @@ sub source { # if we got here, they probably passed a full class name my $mapped = $self->class_mappings->{$moniker}; - croak "Can't find source for ${moniker}" + $self->throw_exception("Can't find source for ${moniker}") unless $mapped && exists $sreg->{$mapped}; return $sreg->{$mapped}; } @@ -144,7 +147,9 @@ sub resultset { return $self->source($moniker)->resultset; } -=head2 load_classes [, (, ), { => []}] +=head2 load_classes + +=head3 Arguments: [, (, ), { => []}] Uses L to find all classes under the database class' namespace, or uses the classes you select. Then it loads the component (using L), @@ -185,7 +190,7 @@ sub load_classes { } } else { eval "require Module::Find;"; - $class->throw("No arguments to load_classes and couldn't load". + $class->throw_exception("No arguments to load_classes and couldn't load". " Module::Find ($@)") if $@; my @comp = map { substr $_, length "${class}::" } Module::Find::findallmod($class); $comps_for{$class} = \@comp; @@ -199,11 +204,14 @@ sub load_classes { die $@ unless $@ =~ /Can't locate/; } $class->register_class($comp => $comp_class); + # if $class->can('result_source_instance'); } } } -=head2 compose_connection <@db_info> +=head2 compose_connection + +=head3 Arguments: <@db_info> This is the most important method in this class. it takes a target namespace, as well as dbh connection info, and creates a L class as @@ -230,8 +238,29 @@ you expect. sub compose_connection { my ($self, $target, @info) = @_; my $base = 'DBIx::Class::ResultSetProxy'; - $base->require; + eval "require ${base};"; + $self->throw_exception("No arguments to load_classes and couldn't load". + " ${base} ($@)") if $@; + + if ($self eq $target) { + # Pathological case, largely caused by the docs on early C::M::DBIC::Plain + foreach my $moniker ($self->sources) { + my $source = $self->source($moniker); + my $class = $source->result_class; + $self->inject_base($class, $base); + $class->mk_classdata(resultset_instance => $source->resultset); + $class->mk_classdata(class_resolver => $self); + } + $self->connection(@info); + return $self; + } + my $schema = $self->compose_namespace($target, $base); + { + no strict 'refs'; + *{"${target}::schema"} = sub { $schema }; + } + $schema->connection(@info); foreach my $moniker ($schema->sources) { my $source = $schema->source($moniker); @@ -260,8 +289,6 @@ sub compose_namespace { } { no strict 'refs'; - *{"${target}::schema"} = - sub { $schema }; foreach my $meth (qw/class source resultset/) { *{"${target}::${meth}"} = sub { shift->schema->$meth(@_) }; @@ -270,7 +297,9 @@ sub compose_namespace { return $schema; } -=head2 setup_connection_class <$target> <@info> +=head2 setup_connection_class + +=head3 Arguments: <$target> <@info> Sets up a database connection class to inject between the schema and the subclasses the schema creates. @@ -284,7 +313,9 @@ sub setup_connection_class { $target->connection(@info); } -=head2 connection(@args) +=head2 connection + +=head3 Arguments: (@args) Instantiates a new Storage object of type storage_type and passes the arguments to $storage->connect_info. Sets the connection in-place on @@ -297,20 +328,48 @@ sub connection { my $storage_class = $self->storage_type; $storage_class = 'DBIx::Class::Storage'.$storage_class if $storage_class =~ m/^::/; - $storage_class->require; + eval "require ${storage_class};"; + $self->throw_exception("No arguments to load_classes and couldn't load". + " ${storage_class} ($@)") if $@; my $storage = $storage_class->new; $storage->connect_info(\@info); $self->storage($storage); return $self; } -=head2 connect(@info) +=head2 connect + +=head3 Arguments: (@info) Conveneience method, equivalent to $schema->clone->connection(@info) =cut -sub connect { shift->clone->connection(@_) }; +sub connect { shift->clone->connection(@_) } + +=head2 txn_begin + +Begins a transaction (does nothing if AutoCommit is off). + +=cut + +sub txn_begin { shift->storage->txn_begin } + +=head2 txn_commit + +Commits the current transaction. + +=cut + +sub txn_commit { shift->storage->txn_commit } + +=head2 txn_rollback + +Rolls back the current transaction. + +=cut + +sub txn_rollback { shift->storage->txn_rollback } =head2 clone @@ -330,6 +389,57 @@ sub clone { return $clone; } +=head2 populate + +=head3 Arguments: ($moniker, \@data); + +Populates the source registered with the given moniker with the supplied data. +@data should be a list of listrefs, the first containing column names, the +second matching values - i.e. + +$schema->populate('Foo', [ + [ qw/foo_id foo_string/ ], + [ 1, 'One' ], + [ 2, 'Two' ], + ... +]); + +=cut + +sub populate { + my ($self, $name, $data) = @_; + my $rs = $self->resultset($name); + my @names = @{shift(@$data)}; + foreach my $item (@$data) { + my %create; + @create{@names} = @$item; + $rs->create(\%create); + } +} + +=head2 throw_exception + +Defaults to using Carp::Clan to report errors from user perspective. + +=cut + +sub throw_exception { + my ($self) = shift; + croak @_; +} + +=head2 deploy + +Attempts to deploy the schema to the current storage + +=cut + +sub deploy { + my ($self) = shift; + $self->throw_exception("Can't deploy without storage") unless $self->storage; + $self->storage->deploy($self); +} + 1; =head1 AUTHORS