X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FAdmin.pm;h=7052fbfea36aa5487d4575b4630de1760947c79b;hb=0c1a4a15ae0eb261ff8aabfd6383ddf1d822d690;hp=e47e93b8727f2f7533e6bba35bbedb41de27181c;hpb=a4a02f15a49ccd4ab04bd18ff58d1de7fbe8b23f;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Admin.pm b/lib/DBIx/Class/Admin.pm index e47e93b..7052fbf 100644 --- a/lib/DBIx/Class/Admin.pm +++ b/lib/DBIx/Class/Admin.pm @@ -9,8 +9,6 @@ BEGIN { } use Moose; -use parent 'DBIx::Class::Schema'; - use MooseX::Types::Moose qw/Int Str Any Bool/; use DBIx::Class::Admin::Types qw/DBICConnectInfo DBICHashRef/; use MooseX::Types::JSON qw(JSON); @@ -70,8 +68,8 @@ the class of the schema to load =cut has 'schema_class' => ( - is => 'ro', - isa => Str, + is => 'ro', + isa => Str, ); @@ -82,20 +80,20 @@ 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} ); + require Class::MOP; + Class::MOP::load_class($self->schema_class); + $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 @@ -103,8 +101,8 @@ a resultset from the schema to operate on =cut has 'resultset' => ( - is => 'rw', - isa => Str, + is => 'rw', + isa => Str, ); @@ -116,8 +114,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, ); @@ -129,8 +127,8 @@ 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, ); @@ -141,9 +139,9 @@ a hash ref or json string to be used for passing additonal info to the ->search =cut has 'attrs' => ( - is => 'rw', - isa => DBICHashRef, - coerce => 1, + is => 'rw', + isa => DBICHashRef, + coerce => 1, ); @@ -154,10 +152,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 { @@ -176,8 +174,8 @@ The config file should be in a format readable by Config::General has config_file => ( is => 'ro', - isa => File, - coerce => 1, + isa => File, + coerce => 1, ); @@ -189,29 +187,29 @@ 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}); @@ -229,8 +227,8 @@ 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, ); @@ -241,8 +239,8 @@ Used for install, the version which will be 'installed' in the schema =cut has version => ( - is => 'rw', - isa => Str, + is => 'rw', + isa => Str, ); @@ -253,8 +251,8 @@ Previouse version of the schema to create an upgrade diff for, the full sql for =cut has preversion => ( - is => 'rw', - isa => Str, + is => 'rw', + isa => Str, ); @@ -265,8 +263,8 @@ Try and force certain operations. =cut has force => ( - is => 'rw', - isa => Bool, + is => 'rw', + isa => Bool, ); @@ -277,13 +275,13 @@ 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, ); @@ -297,8 +295,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. +L 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. @@ -335,10 +334,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; } @@ -353,9 +354,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 @@ -367,9 +368,9 @@ 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"; @@ -378,7 +379,7 @@ sub install { } } 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"); } } @@ -392,7 +393,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 @@ -400,13 +401,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 @@ -503,7 +498,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 @@ -519,7 +514,7 @@ sub select { my @data; my @columns = $resultset->result_source->columns(); - push @data, [@columns];# + push @data, [@columns];# while (my $row = $resultset->next()) { my @fields; @@ -534,12 +529,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 { @@ -550,7 +547,7 @@ 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"); } } return $cfg;