[Bast-commits] r9537 - in DBIx-Class/0.08/trunk: lib/DBIx/Class script

[frew at dev.catalyst.perl.org]

Author: frew
Date: 2010-06-02 06:05:39 +0100 (Wed, 02 Jun 2010)
New Revision: 9537

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Admin.pm
   DBIx-Class/0.08/trunk/script/dbicadmin
Log:
perl modules shouldnt munge @INC; thats the job of the script

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Admin.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Admin.pm	2010-06-02 00:45:19 UTC (rev 9536)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Admin.pm	2010-06-02 05:05:39 UTC (rev 9537)
@@ -85,33 +85,15 @@
   lazy_build  => 1,
 );
 
-sub BUILD {
-   my $self = shift;
-   require Class::MOP;
-
-   my @include_dirs = @{$self->include_dirs};
-   @INC = (@include_dirs, @INC);
-   Class::MOP::load_class($self->schema_class);
-}
-
 sub _build_schema {
   my ($self)  = @_;
+
+  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 include_dirs
-
-Extra include directories to look when loading C<schema_class>
-
-=cut
-
-has 'include_dirs' => (
-    is => 'rw',
-    isa => 'ArrayRef',
-    default => sub {[]}
-);
-
 =head2 resultset
 
 a resultset from the schema to operate on

Modified: DBIx-Class/0.08/trunk/script/dbicadmin
===================================================================
--- DBIx-Class/0.08/trunk/script/dbicadmin	2010-06-02 00:45:19 UTC (rev 9536)
+++ DBIx-Class/0.08/trunk/script/dbicadmin	2010-06-02 05:05:39 UTC (rev 9537)
@@ -14,6 +14,7 @@
 use DBIx::Class::Admin::Descriptive;
 #use Getopt::Long::Descriptive;
 use DBIx::Class::Admin;
+require lib;
 
 my $short_description = "utility for administrating DBIx::Class schemata";
 my $synopsis_text =q|
@@ -89,7 +90,7 @@
 
 # FIXME - lowercasing will eventually go away when Getopt::Long::Descriptive is fixed
 if($opts->{i}) {
-    $opts->{include_dirs} = delete $opts->{i};
+    lib->import(delete $opts->{i});
 }
 
 if($opts->{help}) {