Real detabify

[dbsrgits/DBIx-Class.git] / t / admin / 02ddl.t

diff --git a/t/admin/02ddl.t b/t/admin/02ddl.t
index 8ad1399..d65331f 100644 (file)
--- a/t/admin/02ddl.t
+++ b/t/admin/02ddl.t
@@ -8,8 +8,7 @@
 #        FILES:  ---
 #         BUGS:  ---
 #        NOTES:  ---
-#       AUTHOR:  Gordon Irving (), <Gordon.irving@sophos.com>
-#      COMPANY:  Sophos
+#       AUTHOR:  Gordon Irving (), <goraxe@cpan.org>
 #      VERSION:  1.0
 #      CREATED:  28/11/09 16:14:21 GMT
 #     REVISION:  ---
@@ -22,36 +21,39 @@ use Test::More;                      # last test to print
 
 use Test::Exception;
 
-use Path::Class;
-use FindBin qw($Bin);
 
-use Module::Load;
+BEGIN {
+    use FindBin qw($Bin);
+    use File::Spec::Functions qw(catdir);
+    use lib catdir($Bin,'..', '..','lib');
+    use lib catdir($Bin,'..', 'lib');
+
+    eval "use DBIx::Class::Admin";
+    plan skip_all => "Deps not installed: $@" if $@;
+}
 
-use lib dir($Bin,'..', '..','lib')->stringify;
-use lib dir($Bin,'..', 'lib')->stringify;
+use Path::Class;
 
 use ok 'DBIx::Class::Admin';
 
 use DBICTest;
 
 my $sql_dir = dir($Bin,"..","var");
-
+my @connect_info = DBICTest->_database(
+       no_deploy=>1,
+       no_populate=>1,
+       sqlite_use_file => 1,
+);
 { # create the schema
 
 #  make sure we are  clean
 clean_dir($sql_dir);
 
-# create a DBICTest so we can steal its connect info
-my $schema = DBICTest->init_schema(
-    no_deploy=>1,
-    no_populate=>1,
-       );
-
 
 my $admin = DBIx::Class::Admin->new(
        schema_class=> "DBICTest::Schema",
        sql_dir=> $sql_dir,
-       connect_info => $schema->storage->connect_info() 
+       connect_info => \@connect_info, 
 );
 isa_ok ($admin, 'DBIx::Class::Admin', 'create the admin object');
 lives_ok { $admin->create('MySQL'); } 'Can create MySQL sql';
@@ -60,20 +62,23 @@ lives_ok { $admin->create('SQLite'); } 'Can Create SQLite sql';
 
 { # upgrade schema
 
-my $schema = DBICTest->init_schema(
-       no_deploy               => 1,
-       no_populat              => 1,
-       sqlite_use_file => 1,
-);
+#my $schema = DBICTest->init_schema(
+#      no_deploy               => 1,
+#      no_populat              => 1,
+#      sqlite_use_file => 1,
+#);
 
 clean_dir($sql_dir);
-load 'DBICVersionOrig';
+require DBICVersionOrig;
 
 my $admin = DBIx::Class::Admin->new(
        schema_class => 'DBICVersion::Schema', 
        sql_dir =>  $sql_dir,
-       connect_info => $schema->storage->connect_info(),
+       connect_info => \@connect_info,
 );
+
+my $schema = $admin->schema();
+
 lives_ok { $admin->create($schema->storage->sqlt_type(), {add_drop_table=>0}); } 'Can create DBICVersionOrig sql in ' . $schema->storage->sqlt_type;
 lives_ok { $admin->deploy(  ) } 'Can Deploy schema';
 
@@ -83,12 +88,12 @@ lives_ok { $schema = DBICVersion::Schema->connect(@{$schema->storage->connect_in
 is($schema->get_db_version, $DBICVersion::Schema::VERSION, 'Schema deployed and versions match');
 
 
-load 'DBICVersionNew';
+require DBICVersionNew;
 
 $admin = DBIx::Class::Admin->new(
        schema_class => 'DBICVersion::Schema', 
        sql_dir =>  "t/var",
-       connect_info => $schema->storage->connect_info(),
+       connect_info => \@connect_info
 );
 
 lives_ok { $admin->create($schema->storage->sqlt_type(), {}, "1.0" ); } 'Can create diff for ' . $schema->storage->sqlt_type;
@@ -105,17 +110,11 @@ is($schema->get_db_version, $DBICVersion::Schema::VERSION, 'Schema and db versio
 
 clean_dir($sql_dir);
 
-my $schema = DBICTest->init_schema(
-    no_deploy=>1,
-    no_populate=>1,
-       sqlite_use_file => 1,
-       );
-
 my $admin = DBIx::Class::Admin->new(
        schema_class    => 'DBICVersion::Schema', 
        sql_dir                 => $sql_dir,
-       connect_info    => $schema->storage->connect_info(),
        _confirm                => 1,
+       connect_info    => \@connect_info,
 );
 
 $admin->version("3.0");