Move even more utils into DBIC::_Util (see next commit)

[dbsrgits/DBIx-Class.git] / t / lib / DBICTest / Schema.pm

diff --git a/t/lib/DBICTest/Schema.pm b/t/lib/DBICTest/Schema.pm
index 5d2518a..1b436f6 100644 (file)
--- a/t/lib/DBICTest/Schema.pm
+++ b/t/lib/DBICTest/Schema.pm
@@ -1,14 +1,14 @@
 package # hide from PAUSE
     DBICTest::Schema;
 
+# load early so that `perl -It/lib -MDBICTest::Schema` keeps  working
+use ANFANG;
+
 use strict;
 use warnings;
 no warnings 'qw';
 
-use base 'DBIx::Class::Schema';
-
-use DBICTest::Util qw/populate_weakregistry assert_empty_weakregistry/;
-use namespace::clean;
+use base 'DBICTest::BaseSchema';
 
 __PACKAGE__->mk_group_accessors(simple => 'custom_attr');
 
@@ -54,7 +54,7 @@ __PACKAGE__->load_classes(qw/
     'CD_to_Producer',
     'Dummy',    # this is a real result class we remove in the hook below
   ),
-  qw/SelfRefAlias TreeLike TwoKeyTreeLike Event EventTZ NoPrimaryKey/,
+  qw/SelfRefAlias TreeLike TwoKeyTreeLike Event NoPrimaryKey/,
   qw/Collection CollectionObject TypedObject Owners BooksInLibrary/,
   qw/ForceForeign Encoded/,
 );
@@ -65,39 +65,4 @@ sub sqlt_deploy_hook {
   $sqlt_schema->drop_table('dummy');
 }
 
-my $weak_registry = {};
-
-sub clone {
-  my $self = shift->next::method(@_);
-  populate_weakregistry ( $weak_registry, $self )
-    if $INC{'Test/Builder.pm'};
-  $self;
-}
-
-sub connection {
-  my $self = shift->next::method(@_);
-
-  if ($INC{'Test/Builder.pm'}) {
-    populate_weakregistry ( $weak_registry, $self->storage );
-
-    my $cur_connect_call = $self->storage->on_connect_call;
-
-    $self->storage->on_connect_call([
-      (ref $cur_connect_call eq 'ARRAY'
-        ? @$cur_connect_call
-        : ($cur_connect_call || ())
-      ),
-      [sub {
-        populate_weakregistry( $weak_registry, shift->_dbh )
-      }],
-    ]);
-  }
-
-  $self;
-}
-
-END {
-  assert_empty_weakregistry($weak_registry, 'quiet');
-}
-
 1;