}
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);
=cut
has 'schema_class' => (
- is => 'ro',
- isa => Str,
+ is => 'ro',
+ isa => Str,
);
=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);
+ 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()} ); # , $self->connect_info->[3], { ignore_version => 1} );
=cut
has 'resultset' => (
- is => 'rw',
- isa => Str,
+ is => 'rw',
+ isa => Str,
);
has 'where' => (
is => 'rw',
- isa => DBICHashRef,
- coerce => 1,
+ isa => DBICHashRef,
+ coerce => 1,
);
has 'set' => (
is => 'rw',
- isa => DBICHashRef,
- coerce => 1,
+ isa => DBICHashRef,
+ coerce => 1,
);
=cut
has 'attrs' => (
- is => 'rw',
- isa => DBICHashRef,
- coerce => 1,
+ is => 'rw',
+ isa => DBICHashRef,
+ coerce => 1,
);
=cut
has 'connect_info' => (
- is => 'ro',
- isa => DBICConnectInfo,
+ is => 'ro',
+ isa => DBICConnectInfo,
lazy_build => 1,
- coerce => 1,
+ coerce => 1,
);
sub _build_connect_info {
has config_file => (
is => 'ro',
- isa => File,
- coerce => 1,
+ isa => File,
+ coerce => 1,
);
=cut
has 'config_stanza' => (
- is => 'ro',
- isa => Str,
+ is => 'ro',
+ isa => Str,
);
=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});
has 'sql_dir' => (
is => 'ro',
- isa => Dir,
- coerce => 1,
+ isa => Dir,
+ coerce => 1,
);
=cut
has version => (
- is => 'rw',
- isa => Str,
+ is => 'rw',
+ isa => Str,
);
=cut
has preversion => (
- is => 'rw',
- isa => Str,
+ is => 'rw',
+ isa => Str,
);
=cut
has force => (
- is => 'rw',
- isa => Bool,
+ is => 'rw',
+ isa => Bool,
);
=cut
has quiet => (
- is => 'rw',
- isa => Bool,
+ is => 'rw',
+ isa => Bool,
);
has '_confirm' => (
- is => 'bare',
- isa => Bool,
+ is => 'bare',
+ isa => Bool,
);
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 {
my $ret = $schema->upgrade();
return $ret;
}
}
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");
}
}
if (!$schema->get_db_version() ) {
# schema is unversioned
$schema->deploy( $args, $self->sql_dir)
- or $self->throw_exception ("could not deploy schema");
+ or $schema->throw_exception ("Could not deploy schema.\n"); # FIXME deploy() does not return 1/0 on success/fail
} else {
- $self->throw_exception("there already is a database with a version here, try upgrade instead");
+ $schema->throw_exception("A versioned schema has already been deployed, try upgrade instead.\n");
}
}
$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;