X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FAdmin.pm;h=0eb6e0cf6d09b4e472e16690e1673ce6f37e01f1;hb=d401ab6;hp=8814bf7e8bbc0eb694f6ceaf71cc3f59c3e17256;hpb=71766122528404a08915bd504a2b8058ba3aa992;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Admin.pm b/lib/DBIx/Class/Admin.pm index 8814bf7..0eb6e0c 100644 --- a/lib/DBIx/Class/Admin.pm +++ b/lib/DBIx/Class/Admin.pm @@ -2,33 +2,17 @@ package DBIx::Class::Admin; # check deps BEGIN { - my @_deps = qw( - Moose MooseX::Types MooseX::Types::JSON MooseX::Types::Path::Class - Try::Tiny parent JSON::Any Class::C3::Componentised - namespace::autoclean - ); - - my @_missing_deps; - foreach my $dep (@_deps) { - eval "require $dep"; - if ($@) { - push @_missing_deps, $dep; - } - } - - if (@_missing_deps > 0) { - die "The following dependecies are missing " . join ",", @_missing_deps; - } + use DBIx::Class; + die('The following modules are required for DBIx::Class::Admin ' . DBIx::Class::Optional::Dependencies->req_missing_for ('admin') ) + unless DBIx::Class::Optional::Dependencies->req_ok_for ('admin'); } use Moose; -use parent 'DBIx::Class::Schema'; -use Carp::Clan qw/^DBIx::Class/; - use MooseX::Types::Moose qw/Int Str Any Bool/; use DBIx::Class::Admin::Types qw/DBICConnectInfo DBICHashRef/; use MooseX::Types::JSON qw(JSON); use MooseX::Types::Path::Class qw(Dir File); +use MooseX::Types::LoadableClass qw(LoadableClass); use Try::Tiny; use JSON::Any qw(DWIW XS JSON); use namespace::autoclean; @@ -72,31 +56,10 @@ DBIx::Class::Admin - Administration object for schemas =head1 REQUIREMENTS -The following CPAN modules are required to use C and this module: - -L - -L - -L - -L - -L - -L - -L - -(L preferred for barekey support) - -L - -L +The Admin interface has additional requirements not currently part of +L. See L for more details. -L - -=head1 Attributes +=head1 ATTRIBUTES =head2 schema_class @@ -105,8 +68,8 @@ the class of the schema to load =cut has 'schema_class' => ( - is => 'ro', - isa => Str, + is => 'ro', + isa => LoadableClass, ); @@ -117,20 +80,18 @@ A pre-connected schema object can be provided for manipulation =cut has 'schema' => ( - is => 'ro', - isa => 'DBIx::Class::Schema', + is => 'ro', + isa => 'DBIx::Class::Schema', lazy_build => 1, ); sub _build_schema { my ($self) = @_; - $self->ensure_class_loaded($self->schema_class); - $self->connect_info->[3]->{ignore_version} =1; - return $self->schema_class->connect(@{$self->connect_info()} ); # , $self->connect_info->[3], { ignore_version => 1} ); + $self->connect_info->[3]{ignore_version} = 1; + return $self->schema_class->connect(@{$self->connect_info}); } - =head2 resultset a resultset from the schema to operate on @@ -138,8 +99,8 @@ a resultset from the schema to operate on =cut has 'resultset' => ( - is => 'rw', - isa => Str, + is => 'rw', + isa => Str, ); @@ -151,8 +112,8 @@ a hash ref or json string to be used for identifying data to manipulate has 'where' => ( is => 'rw', - isa => DBICHashRef, - coerce => 1, + isa => DBICHashRef, + coerce => 1, ); @@ -164,21 +125,21 @@ a hash ref or json string to be used for inserting or updating data has 'set' => ( is => 'rw', - isa => DBICHashRef, - coerce => 1, + isa => DBICHashRef, + coerce => 1, ); =head2 attrs -a hash ref or json string to be used for passing additonal info to the ->search call +a hash ref or json string to be used for passing additional info to the ->search call =cut has 'attrs' => ( - is => 'rw', - isa => DBICHashRef, - coerce => 1, + is => 'rw', + isa => DBICHashRef, + coerce => 1, ); @@ -189,10 +150,10 @@ connect_info the arguments to provide to the connect call of the schema_class =cut has 'connect_info' => ( - is => 'ro', - isa => DBICConnectInfo, + is => 'ro', + isa => DBICConnectInfo, lazy_build => 1, - coerce => 1, + coerce => 1, ); sub _build_connect_info { @@ -205,48 +166,48 @@ sub _build_connect_info { config_file provide a config_file to read connect_info from, if this is provided config_stanze should also be provided to locate where the connect_info is in the config -The config file should be in a format readable by Config::General +The config file should be in a format readable by Config::Any. =cut has config_file => ( is => 'ro', - isa => File, - coerce => 1, + isa => File, + coerce => 1, ); =head2 config_stanza -config_stanza for use with config_file should be a '::' deliminated 'path' to the connection information +config_stanza for use with config_file should be a '::' delimited 'path' to the connection information designed for use with catalyst config files =cut has 'config_stanza' => ( - is => 'ro', - isa => Str, + is => 'ro', + isa => Str, ); =head2 config -Instead of loading from a file the configuration can be provided directly as a hash ref. Please note +Instead of loading from a file the configuration can be provided directly as a hash ref. Please note config_stanza will still be required. =cut has config => ( - is => 'ro', - isa => DBICHashRef, + is => 'ro', + isa => DBICHashRef, lazy_build => 1, ); sub _build_config { my ($self) = @_; - eval { require Config::Any } - or $self->throw_exception( "Config::Any is required to parse the config file"); + try { require Config::Any } + catch { die ("Config::Any is required to parse the config file.\n") }; my $cfg = Config::Any->load_files ( {files => [$self->config_file], use_ext =>1, flatten_to_hash=>1}); @@ -264,11 +225,22 @@ The location where sql ddl files should be created or found for an upgrade. has 'sql_dir' => ( is => 'ro', - isa => Dir, - coerce => 1, + isa => Dir, + coerce => 1, ); +=head2 sql_type + +The type of sql dialect to use for creating sql files from schema + +=cut + +has 'sql_type' => ( + is => 'ro', + isa => Str, +); + =head2 version Used for install, the version which will be 'installed' in the schema @@ -276,20 +248,20 @@ Used for install, the version which will be 'installed' in the schema =cut has version => ( - is => 'rw', - isa => Str, + is => 'rw', + isa => Str, ); =head2 preversion -Previouse version of the schema to create an upgrade diff for, the full sql for that version of the sql must be in the sql_dir +Previous version of the schema to create an upgrade diff for, the full sql for that version of the sql must be in the sql_dir =cut has preversion => ( - is => 'rw', - isa => Str, + is => 'rw', + isa => Str, ); @@ -300,8 +272,8 @@ Try and force certain operations. =cut has force => ( - is => 'rw', - isa => Bool, + is => 'rw', + isa => Bool, ); @@ -312,15 +284,33 @@ Be less verbose about actions =cut has quiet => ( - is => 'rw', - isa => Bool, + is => 'rw', + isa => Bool, ); has '_confirm' => ( - is => 'bare', - isa => Bool, + is => 'bare', + isa => Bool, +); + + +=head2 trace + +Toggle DBIx::Class debug output + +=cut + +has trace => ( + is => 'rw', + isa => Bool, + trigger => \&_trigger_trace, ); +sub _trigger_trace { + my ($self, $new, $old) = @_; + $self->schema->storage->debug($new); +} + =head1 METHODS @@ -332,8 +322,9 @@ has '_confirm' => ( =back -L will generate sql for the supplied schema_class in sql_dir. The flavour of sql to -generate can be controlled by suppling a sqlt_type which should be a L name. +C will generate sql for the supplied schema_class in sql_dir. The +flavour of sql to generate can be controlled by supplying a sqlt_type which +should be a L name. Arguments for L can be supplied in the sqlt_args hashref. @@ -345,6 +336,7 @@ sub create { my ($self, $sqlt_type, $sqlt_args, $preversion) = @_; $preversion ||= $self->preversion(); + $sqlt_type ||= $self->sql_type(); my $schema = $self->schema(); # create the dir if does not exist @@ -370,10 +362,12 @@ B sub upgrade { my ($self) = @_; my $schema = $self->schema(); + if (!$schema->get_db_version()) { # schema is unversioned - $self->throw_exception ("could not determin current schema version, please either install or deploy"); + $schema->throw_exception ("Could not determin current schema version, please either install() or deploy().\n"); } else { + $schema->upgrade_directory ($self->sql_dir) if $self->sql_dir; # this will override whatever default the schema has my $ret = $schema->upgrade(); return $ret; } @@ -388,9 +382,9 @@ sub upgrade { =back -install is here to help when you want to move to L and have an existing -database. install will take a version and add the version tracking tables and 'install' the version. No -further ddl modification takes place. Setting the force attribute to a true value will allow overriding of +install is here to help when you want to move to L and have an existing +database. install will take a version and add the version tracking tables and 'install' the version. No +further ddl modification takes place. Setting the force attribute to a true value will allow overriding of already versioned databases. =cut @@ -402,18 +396,18 @@ sub install { $version ||= $self->version(); if (!$schema->get_db_version() ) { # schema is unversioned - print "Going to install schema version\n"; + print "Going to install schema version\n" if (!$self->quiet); my $ret = $schema->install($version); - print "retun is $ret\n"; + print "return is $ret\n" if (!$self->quiet); } elsif ($schema->get_db_version() and $self->force ) { - carp "Forcing install may not be a good idea"; + warn "Forcing install may not be a good idea\n"; if($self->_confirm() ) { $self->schema->_set_db_version({ version => $version}); } } else { - $self->throw_exception ("schema already has a version not installing, try upgrade instead"); + $schema->throw_exception ("Schema already has a version. Try upgrade instead.\n"); } } @@ -427,7 +421,7 @@ sub install { =back -deploy will create the schema at the connected database. C<$args> are passed straight to +deploy will create the schema at the connected database. C<$args> are passed straight to L. =cut @@ -435,13 +429,7 @@ L. sub deploy { my ($self, $args) = @_; my $schema = $self->schema(); - if (!$schema->get_db_version() ) { - # schema is unversioned - $schema->deploy( $args, $self->sql_dir) - or $self->throw_exception ("could not deploy schema"); - } else { - $self->throw_exception("there already is a database with a version here, try upgrade instead"); - } + $schema->deploy( $args, $self->sql_dir ); } =head2 insert @@ -538,7 +526,7 @@ sub delete { =back -select takes the name of a resultset from the schema_class, a where hashref and a attrs to pass to ->search. +select takes the name of a resultset from the schema_class, a where hashref and a attrs to pass to ->search. The found data is returned in a array ref where the first row will be the columns list. =cut @@ -554,7 +542,7 @@ sub select { my @data; my @columns = $resultset->result_source->columns(); - push @data, [@columns];# + push @data, [@columns];# while (my $row = $resultset->next()) { my @fields; @@ -569,12 +557,14 @@ sub select { sub _confirm { my ($self) = @_; - print "Are you sure you want to do this? (type YES to confirm) \n"; + # mainly here for testing return 1 if ($self->meta->get_attribute('_confirm')->get_value($self)); + + print "Are you sure you want to do this? (type YES to confirm) \n"; my $response = ; - return 1 if ($response=~/^YES/); - return; + + return ($response=~/^YES/); } sub _find_stanza { @@ -585,9 +575,10 @@ sub _find_stanza { $cfg = $cfg->{$path}; } else { - $self->throw_exception("could not find $stanza in config, $path did not seem to exist"); + die ("Could not find $stanza in config, $path does not seem to exist.\n"); } } + $cfg = $cfg->{connect_info} if exists $cfg->{connect_info}; return $cfg; }