X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FModel%2FDBIC%2FSchema.pm;h=0520b6890c846fd91660addc555c9f98acba7fc7;hb=018eb0e2f55391533246baeb6a176e6aa694f7a1;hp=b56ef6b03085469abca6d038ff12b0a7b57e18ea;hpb=045b378970605512e7e965909dc0c052f726e916;p=catagits%2FCatalyst-Model-DBIC-Schema.git diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm index b56ef6b..0520b68 100644 --- a/lib/Catalyst/Model/DBIC/Schema.pm +++ b/lib/Catalyst/Model/DBIC/Schema.pm @@ -1,14 +1,17 @@ package Catalyst::Model::DBIC::Schema; use strict; +use warnings; + +our $VERSION = '0.20'; + use base qw/Catalyst::Model Class::Accessor::Fast Class::Data::Accessor/; use NEXT; use UNIVERSAL::require; use Carp; +use Data::Dumper; require DBIx::Class; -our $VERSION = '0.14'; - __PACKAGE__->mk_classaccessor('composed_schema'); __PACKAGE__->mk_accessors('schema'); @@ -38,20 +41,20 @@ Actor in MyApp/Schema/FilmDB/Actor.pm: package MyApp::Schema::FilmDB::Actor; use base qw/DBIx::Class/ - + __PACKAGE__->load_components(qw/Core/); __PACKAGE__->table('actor'); - + ... and a Role in MyApp/Schema/Role.pm: package MyApp::Schema::FilmDB::Role; use base qw/DBIx::Class/ - + __PACKAGE__->load_components(qw/Core/); __PACKAGE__->table('role'); - + ... Notice that the schema is in MyApp::Schema, not in MyApp::Model. This way it's @@ -64,7 +67,7 @@ MyApp/Model/FilmDB.pm: package MyApp::Model::FilmDB; use base qw/Catalyst::Model::DBIC::Schema/; - + __PACKAGE__->config( schema_class => 'MyApp::Schema::FilmDB', connect_info => [ @@ -88,11 +91,11 @@ You can also use it to set up DBIC authentication with Authentication::Store::DBIC in MyApp.pm: package MyApp; - + use Catalyst qw/... Authentication::Store::DBIC/; - + ... - + __PACKAGE__->config->{authentication}{dbic} = { user_class => 'FilmDB::Actor', user_field => 'name', @@ -106,42 +109,39 @@ documentation in the L distribution. Some examples are given below: - # to access schema methods directly: - $c->model('FilmDB')->schema->source(...); + # to access schema methods directly: + $c->model('FilmDB')->schema->source(...); - # to access the source object, resultset, and class: - $c->model('FilmDB')->source(...); - $c->model('FilmDB')->resultset(...); - $c->model('FilmDB')->class(...); + # to access the source object, resultset, and class: + $c->model('FilmDB')->source(...); + $c->model('FilmDB')->resultset(...); + $c->model('FilmDB')->class(...); - # For resultsets, there's an even quicker shortcut: - $c->model('FilmDB::Actor') - # is the same as $c->model('FilmDB')->resultset('Actor') + # For resultsets, there's an even quicker shortcut: + $c->model('FilmDB::Actor') + # is the same as $c->model('FilmDB')->resultset('Actor') - # To get the composed schema for making new connections: - my $newconn = $c->model('FilmDB')->composed_schema->connect(...); + # To get the composed schema for making new connections: + my $newconn = $c->model('FilmDB')->composed_schema->connect(...); - # Or the same thing via a convenience shortcut: - my $newconn = $c->model('FilmDB')->connect(...); + # Or the same thing via a convenience shortcut: + my $newconn = $c->model('FilmDB')->connect(...); - # or, if your schema works on different storage drivers: - my $newconn = $c->model('FilmDB')->composed_schema->clone(); - $newconn->storage_type('::LDAP'); - $newconn->connection(...); + # or, if your schema works on different storage drivers: + my $newconn = $c->model('FilmDB')->composed_schema->clone(); + $newconn->storage_type('::LDAP'); + $newconn->connection(...); - # and again, a convenience shortcut - my $newconn = $c->model('FilmDB')->clone(); - $newconn->storage_type('::LDAP'); - $newconn->connection(...); + # and again, a convenience shortcut + my $newconn = $c->model('FilmDB')->clone(); + $newconn->storage_type('::LDAP'); + $newconn->connection(...); =head1 DESCRIPTION This is a Catalyst Model for L-based Models. See -the documentation for L and -L for information -on generating these Models via Helper scripts. The latter of the two -will also generated a L-based Schema class -for you. +the documentation for L for +information on generating these Models via Helper scripts. =head1 CONFIG PARAMETERS @@ -165,37 +165,34 @@ For L, which is the only supported C in L at the time of this writing, the parameters are your dsn, username, password, and connect options hashref. -If you need to specify the L specific parameter -C, or the related C options C, -C, or C, you can place these options into a hashref -as the final element of the C arrayref. If in doubt, don't -specify these options. You would know it if you needed them. +See L for a detailed explanation +of the arguments supported. Examples: - connect_info => [ 'dbi:Pg:dbname=mypgdb', 'postgres', '' ], - - connect_info => [ - 'dbi:SQLite:dbname=foo.db', - { - on_connect_do => [ - 'PRAGMA synchronous = OFF', - ], - } - ], - - connect_info => [ - 'dbi:Pg:dbname=mypgdb', - 'postgres', - '', - { AutoCommit => 0 }, - { - on_connect_do => [ - 'some SQL statement', - 'another SQL statement', - ], - } - ], + connect_info => [ 'dbi:Pg:dbname=mypgdb', 'postgres', '' ], + + connect_info => [ + 'dbi:SQLite:dbname=foo.db', + { + on_connect_do => [ + 'PRAGMA synchronous = OFF', + ], + } + ], + + connect_info => [ + 'dbi:Pg:dbname=mypgdb', + 'postgres', + '', + { AutoCommit => 0 }, + { + on_connect_do => [ + 'some SQL statement', + 'another SQL statement', + ], + } + ], =item storage_type @@ -280,7 +277,9 @@ sub new { } else { croak "Either ->config->{connect_info} must be defined for $class" - . " or $schema_class must have connect info defined on it"; + . " or $schema_class must have connect info defined on it" + . "Here's what we got:\n" + . Dumper($self); } } @@ -290,46 +289,8 @@ sub new { $self->schema->storage_type($self->{storage_type}) if $self->{storage_type}; - # XXX This is temporary, until DBIx::Class::Storage::DBI supports the - # same syntax and we switch our requisite to that version somewhere - # down the line. This syntax is already committed into DBIx::Class - # -current branch post-0.06. - # At that time, this whole block can revert back to just being: - # $self->schema->connection(@{$self->{connect_info}}); + $self->schema->connection(@{$self->{connect_info}}); - my $connect_info = [ @{$self->{connect_info}} ]; - my ($on_connect_do, %sql_maker_opts); - if($DBIx::Class::VERSION < 0.069) { - my $used; - my $last_info = $self->{connect_info}->[-1]; - if(ref $last_info eq 'HASH') { - if($on_connect_do = $last_info->{on_connect_do}) { - $used = 1; - } - for my $sql_maker_opt (qw/limit_dialect quote_char name_sep/) { - if(my $opt_val = $last_info->{$sql_maker_opt}) { - $used = 1; - $sql_maker_opts{$sql_maker_opt} = $opt_val; - } - } - pop(@$connect_info) if $used; - } - } - - $self->schema->connection(@$connect_info); - - if($DBIx::Class::VERSION < 0.069) { - $self->schema->storage->on_connect_do($on_connect_do) - if $on_connect_do; - foreach my $sql_maker_opt (keys %sql_maker_opts) { - $self->schema->storage->sql_maker->$sql_maker_opt( - $sql_maker_opts{$sql_maker_opt} - ); - } - } - - # XXX end of compatibility block referenced above - no strict 'refs'; foreach my $moniker ($self->schema->sources) { my $classname = "${class}::$moniker"; @@ -358,8 +319,7 @@ L, L, L, Stuff related to DBIC and this Model style: L, L, -L, L, -L +L, L =head1 AUTHOR