Revert lazy-loading to make master work again.

gjungwirth/sqlite
Andreas Granig 12 years ago
parent 55211a946a
commit 936fd2a248

@ -15,7 +15,6 @@ my $builder = Module::Build->new(
'DBIx::Class::Schema::Loader' => 0,
'File::Path' => 0,
'Getopt::Long' => 0,
'Module::Runtime' => 0,
'MooseX::ClassAttribute' => 0,
'MooseX::FileAttribute' => 0,
'MooseX::NonMoose' => 0,

@ -1,7 +1,6 @@
package NGCP::Schema;
use Sipwise::Base;
use aliased 'NGCP::Schema::Exception';
use Module::Runtime qw(use_module);
use NGCP::Schema::Config qw();
use Regexp::Common qw(net);
use Regexp::IPv6 qw($IPv6_re);
@ -10,25 +9,18 @@ extends 'DBIx::Class::Schema';
our $VERSION = '2.004';
__PACKAGE__->load_namespaces(
default_resultset_class => 'ResultSet',
);
class_has('config', is => 'rw', isa => 'NGCP::Schema::Config', lazy => 1, default => sub {
return NGCP::Schema::Config->instance;
});
$CLASS->register_sources('admins');
method connection {
$self->SUPER::connection($self->config->as_hash->{ngcp_connect_info});
}
sub register_sources {
my ($self, @source_names) = @_;
for my $source_name (@source_names) {
my $module_name = "NGCP::Schema::Result::$source_name";
use_module($module_name);
$self->register_class($source_name => $module_name);
}
}
method validate($data, $mandatory_params, $optional_params?) {
Exception->throw({
description => 'Client.Syntax.MissingParam',

@ -150,7 +150,7 @@ __PACKAGE__->has_many(
__PACKAGE__->has_many(
"voip_rewrite_rule_sets",
"NGCP::Schema::Result::voip_rewrite_rule_sets",
"NGCP::Schema::Result::billing_profiles",
{ "foreign.reseller_id" => "self.id" },
{ cascade_copy => 0, cascade_delete => 0 },
);
@ -302,12 +302,6 @@ Type: has_many
Related object: L<NGCP::Schema::Result::voip_numbers>
=head2 voip_rewrite_rule_sets
Type: has_many
Related object: L<NGCP::Schema::Result::voip_rewrite_rule_sets>
=cut

@ -161,12 +161,6 @@ Type: has_many
Related object: L<NGCP::Schema::Result::voip_rewrite_rules>
=head2 reseller
Type: belongs_to
Related object: L<NGCP::Schema::Result::resellers>
=cut

Loading…
Cancel
Save