s/subclass/moniker/ + more db_schema fixes

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / dbixcsl_common_tests.pm

diff --git a/t/dbixcsl_common_tests.pm b/t/dbixcsl_common_tests.pm
index 04d01ff..b9c5624 100644 (file)
--- a/t/dbixcsl_common_tests.pm
+++ b/t/dbixcsl_common_tests.pm
@@ -40,29 +40,31 @@ sub run_tests {
 
     $self->create();
 
-    my $namespace = 'DBIXCSL_Test_' . $self->{vendor};
+    my $schema_class = 'DBIXCSL_Test_' . $self->{vendor} . '::Schema';
 
     my $debug = ($self->{verbose} > 1) ? 1 : 0;
 
-    my $schema_pkg = "$namespace\::Schema";
+    my %loader_opts = (
+        dsn           => $self->{dsn},
+        user          => $self->{user},
+        password      => $self->{password},
+        constraint    => '^(?:\S+\.)?(?i:loader_test)[0-9]+$',
+        relationships => 1,
+        debug         => $debug,
+    );
+
+    $loader_opts{db_schema} = $self->{db_schema} if $self->{db_schema};
+    $loader_opts{drop_db_schema} = $self->{drop_db_schema} if $self->{drop_db_schema};
 
     eval qq{
-        package $schema_pkg;
-       use base qw/DBIx::Class::Schema::Loader/;
-
-        __PACKAGE__->load_from_connection(
-            dsn           => "$self->{dsn}",
-            user          => "$self->{user}",
-            password      => "$self->{password}",
-            namespace     => "$namespace",
-            constraint    => '^loader_test.*',
-            relationships => 1,
-            debug         => "$debug",
-        );
+        package $schema_class;
+        use base qw/DBIx::Class::Schema::Loader/;
+
+        __PACKAGE__->load_from_connection(\%loader_opts);
     };
     ok(!$@, "Loader initialization failed: $@");
 
-    my $conn = $schema_pkg->connect($self->{dsn},$self->{user},$self->{passwd});
+    my $conn = $schema_class->connect($self->{dsn},$self->{user},$self->{password});
 
     my $moniker1 = $conn->moniker('loader_test1');
     my $rsobj1 = $conn->resultset($moniker1);
@@ -108,7 +110,7 @@ sub run_tests {
 
         # basic rel test
         my $obj4 = $rsobj4->find(123);
-        isa_ok( $obj4->fkid, "$namespace\::$moniker3");
+        isa_ok( $obj4->fkid, "$schema_class\::$moniker3");
 
         # fk def in comments should not be parsed
         my $obj5 = $rsobj5->find( id1 => 1, id2 => 1 );
@@ -116,7 +118,7 @@ sub run_tests {
 
         # mulit-col fk def (works for some, not others...)
         my $obj6 = $rsobj6->find(1);
-        isa_ok( $obj6->loader_test2, "$namespace\::$moniker2" );
+        isa_ok( $obj6->loader_test2, "$schema_class\::$moniker2" );
         SKIP: {
             skip "Multi-column FKs are only half-working for this vendor", 1
                 unless $self->{multi_fk_broken};
@@ -125,7 +127,7 @@ sub run_tests {
 
         # fk that references a non-pk key (UNIQUE)
         my $obj8 = $rsobj8->find(1);
-        isa_ok( $obj8->loader_test7, "$namespace\::$moniker7" );
+        isa_ok( $obj8->loader_test7, "$schema_class\::$moniker7" );
 
         # from Chisel's tests...
         SKIP: {
@@ -166,7 +168,7 @@ sub run_tests {
                     'One $rsobj10 returned from search' );
 
                 my $obj10_3 = $results->first();
-                isa_ok( $obj10_3, "$namespace\::$moniker10" );
+                isa_ok( $obj10_3, "$schema_class\::$moniker10" );
                 is( $obj10_3->loader_test11()->id(), $obj11->id(),
                     'found same $rsobj11 object we expected' );
             }
@@ -177,7 +179,7 @@ sub run_tests {
 sub dbconnect {
     my ($self, $complain) = @_;
 
-    DBI->connect(
+    my $dbh = DBI->connect(
          $self->{dsn}, $self->{user},
          $self->{password},
          {
@@ -186,6 +188,10 @@ sub dbconnect {
              AutoCommit => 1,
          }
     );
+
+    die "Failed to connect to database: $DBI::errstr" if !$dbh;
+
+    return $dbh;
 }
 
 sub create {
@@ -245,9 +251,9 @@ sub create {
 
         qq{
             CREATE TABLE loader_test5 (
-                id1 INTEGER,
-                id2 INTEGER, -- , id2 INTEGER REFERENCES loader_test1,
-                dat TEXT,
+                id1 INTEGER NOT NULL,
+                id2 INTEGER NOT NULL, -- , id2 INTEGER REFERENCES loader_test1,
+                dat VARCHAR(8),
                 PRIMARY KEY (id1,id2)
             ) $self->{innodb};
         },
@@ -259,7 +265,7 @@ sub create {
                 id $self->{auto_inc_pk},
                 id2 INTEGER,
                 loader_test2 INTEGER,
-                dat TEXT,
+                dat VARCHAR(8),
                 FOREIGN KEY (loader_test2) REFERENCES loader_test2 (id),
                 FOREIGN KEY (id, id2 ) REFERENCES loader_test5 (id1,id2)
             ) $self->{innodb};
@@ -272,7 +278,7 @@ sub create {
             CREATE TABLE loader_test7 (
                 id INTEGER NOT NULL PRIMARY KEY,
                 id2 VARCHAR(8) NOT NULL UNIQUE,
-                dat TEXT
+                dat VARCHAR(8)
             ) $self->{innodb};
         },
 
@@ -282,7 +288,7 @@ sub create {
             CREATE TABLE loader_test8 (
                 id INTEGER NOT NULL PRIMARY KEY,
                 loader_test7 VARCHAR(8) NOT NULL,
-                dat TEXT,
+                dat VARCHAR(8),
                 FOREIGN KEY (loader_test7) REFERENCES loader_test7 (id2)
             ) $self->{innodb};
         },
@@ -292,7 +298,7 @@ sub create {
 
         qq{
             CREATE TABLE loader_test9 (
-                loader_test9 TEXT NOT NULL
+                loader_test9 VARCHAR(8) NOT NULL
             ) $self->{innodb};
         },
     );
@@ -310,7 +316,7 @@ sub create {
             CREATE TABLE loader_test11 (
                 id11 $self->{auto_inc_pk},
                 message VARCHAR(8) DEFAULT 'foo',
-                loader_test10 INTEGER NOT NULL,
+                loader_test10 INTEGER,
                 FOREIGN KEY (loader_test10) REFERENCES loader_test10 (id10)
             ) $self->{innodb};
         },
@@ -320,11 +326,19 @@ sub create {
          q{ REFERENCES loader_test11 (id11); }),
     );
 
+    $self->drop_tables;
+
     $self->{created} = 1;
 
     my $dbh = $self->dbconnect(1);
     $dbh->do($_) for (@statements);
     unless($self->{skip_rels}) {
+        # hack for now, since DB2 doesn't like inline comments, and we need
+        # to test one for mysql, which works on everyone else...
+        # this all needs to be refactored anyways.
+        if($self->{vendor} =~ /DB2/i) {
+            @statements_reltests = map { s/--.*\n//; $_ } @statements_reltests;
+        }
         $dbh->do($_) for (@statements_reltests);
         unless($self->{vendor} =~ /sqlite/i) {
             $dbh->do($_) for (@statements_advanced);
@@ -333,7 +347,7 @@ sub create {
     $dbh->disconnect();
 }
 
-sub DESTROY {
+sub drop_tables {
     my $self = shift;
 
     return unless $self->{created};
@@ -379,7 +393,9 @@ sub DESTROY {
         }
     }
     $dbh->do("DROP TABLE $_") for (@tables);
-    $dbh->disconnect();
+    $dbh->disconnect;
 }
 
+sub DESTROY { shift->drop_tables; }
+
 1;