X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FAdmin.pm;h=c7640dab6bfa2cdddbe36b8d8589587092ed7431;hb=f33862043c4b1e9f5823bc407585b43582dbcd5a;hp=b8343f11451a64d9afe44cf0ae2df65f428962e7;hpb=b718fd0a54e55098bf7103e9af83de9db4b192ab;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Admin.pm b/lib/DBIx/Class/Admin.pm index b8343f1..c7640da 100644 --- a/lib/DBIx/Class/Admin.pm +++ b/lib/DBIx/Class/Admin.pm @@ -68,8 +68,8 @@ the class of the schema to load =cut has 'schema_class' => ( - is => 'ro', - isa => Str, + is => 'ro', + isa => Str, ); @@ -80,21 +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) = @_; - require Class::C3::Componentised; - Class::C3::Componentised->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 @@ -102,8 +101,8 @@ a resultset from the schema to operate on =cut has 'resultset' => ( - is => 'rw', - isa => Str, + is => 'rw', + isa => Str, ); @@ -115,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, ); @@ -128,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, ); @@ -140,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, ); @@ -153,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 { @@ -175,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, ); @@ -188,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 die ("Config::Any is required to parse the config file.\n"); + 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}); @@ -228,11 +227,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 @@ -240,8 +250,8 @@ Used for install, the version which will be 'installed' in the schema =cut has version => ( - is => 'rw', - isa => Str, + is => 'rw', + isa => Str, ); @@ -252,8 +262,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, ); @@ -264,8 +274,8 @@ Try and force certain operations. =cut has force => ( - is => 'rw', - isa => Bool, + is => 'rw', + isa => Bool, ); @@ -276,16 +286,34 @@ 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 =head2 create @@ -296,8 +324,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. @@ -309,6 +338,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 @@ -334,10 +364,12 @@ B sub upgrade { my ($self) = @_; my $schema = $self->schema(); + if (!$schema->get_db_version()) { # schema is unversioned $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; } @@ -352,9 +384,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 @@ -366,9 +398,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"; @@ -391,7 +423,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 @@ -399,13 +431,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 $schema->throw_exception ("Could not deploy schema.\n"); # FIXME deploy() does not return 1/0 on success/fail - } else { - $schema->throw_exception("A versioned schema has already been deployed, try upgrade instead.\n"); - } + $schema->deploy( $args, $self->sql_dir ); } =head2 insert @@ -502,7 +528,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 @@ -518,7 +544,7 @@ sub select { my @data; my @columns = $resultset->result_source->columns(); - push @data, [@columns];# + push @data, [@columns];# while (my $row = $resultset->next()) { my @fields; @@ -533,12 +559,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 {