Oracle sequence detection

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / 23dumpmore.t

diff --git a/t/23dumpmore.t b/t/23dumpmore.t
index 9aae2b1..2e2294e 100644 (file)
--- a/t/23dumpmore.t
+++ b/t/23dumpmore.t
@@ -6,10 +6,11 @@ use Data::Dumper::Concise;
 use DBIx::Class::Schema::Loader ();
 use File::Temp 'tempfile';
 use lib qw(t/lib);
-use make_dbictest_db;
 
 my $DUMP_PATH = './t/_dump';
 
+my $TEST_DB_CLASS = 'make_dbictest_db';
+
 sub dump_directly {
     my %tdata = @_;
 
@@ -22,7 +23,7 @@ sub dump_directly {
     my @warns;
     eval {
         local $SIG{__WARN__} = sub { push(@warns, @_) };
-        $schema_class->connect($make_dbictest_db::dsn);
+        $schema_class->connect(get_dsn(\%tdata));
     };
     my $err = $@;
     $schema_class->storage->disconnect if !$err && $schema_class->storage;
@@ -44,7 +45,7 @@ sub dump_dbicdump {
         push @cmd, '-o', "$opt=$val";
     }
 
-    push @cmd, $tdata{classname}, $make_dbictest_db::dsn;
+    push @cmd, $tdata{classname}, get_dsn(\%tdata);
 
     # make sure our current @INC gets used by dbicdump
     use Config;
@@ -69,6 +70,22 @@ sub dump_dbicdump {
     return @warns;
 }
 
+sub get_dsn {
+    my $opts = shift;
+
+    my $test_db_class = $opts->{test_db_class} || $TEST_DB_CLASS;
+
+    eval "require $test_db_class;";
+    die $@ if $@;
+
+    my $dsn = do {
+        no strict 'refs';
+        ${$test_db_class . '::dsn'};
+    };
+
+    return $dsn;
+}
+
 sub check_error {
     my ($got, $expected) = @_;
 
@@ -112,7 +129,9 @@ sub test_dumps {
     
     my $schema_path = $DUMP_PATH . '/' . $schema_class;
     $schema_path =~ s{::}{/}g;
-    dump_file_like($schema_path . '.pm', @$schema_regexes);
+
+    dump_file_like($schema_path . '.pm', @$schema_regexes) if $schema_regexes;
+
     foreach my $src (keys %$file_regexes) {
         my $src_file = $schema_path . '/' . $src . '.pm';
         dump_file_like($src_file, @{$file_regexes->{$src}});
@@ -155,8 +174,6 @@ rmtree($DUMP_PATH, 1, 1);
 # test loading external content
 do_dump_test(
     classname => 'DBICTest::Schema::13',
-    options => { },
-    error => '',
     warnings => [
         qr/Dumping manual schema for DBICTest::Schema::13 to directory /,
         qr/Schema dump completed/,
@@ -172,7 +189,6 @@ qr/package DBICTest::Schema::13::Foo;\nour \$skip_me = "bad mojo";\n1;/
 do_dump_test(
     classname => 'DBICTest::Schema::14',
     options => { skip_load_external => 1 },
-    error => '',
     warnings => [
         qr/Dumping manual schema for DBICTest::Schema::14 to directory /,
         qr/Schema dump completed/,
@@ -198,7 +214,6 @@ close $fh;
 do_dump_test(
     classname => 'DBICTest::Schema::14',
     options => { config_file => $config_file },
-    error => '',
     warnings => [
         qr/Dumping manual schema for DBICTest::Schema::14 to directory /,
         qr/Schema dump completed/,
@@ -212,6 +227,16 @@ do_dump_test(
 
 unlink $config_file;
 
+rmtree($DUMP_PATH, 1, 1);
+
+do_dump_test(
+    classname => 'DBICTest::Schema::14',
+    test_db_class => 'make_dbictest_db_clashing_monikers',
+    error => qr/tables 'bar', 'bars' reduced to the same source moniker 'Bar'/,
+);
+
+rmtree($DUMP_PATH, 1, 1);
+
 # test out the POD
 
 do_dump_test(
@@ -222,7 +247,6 @@ do_dump_test(
             return +{ extra => { is_footext => 1 } } if $col eq 'footext';
         }
     },
-    error => '',
     warnings => [
         qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
         qr/Schema dump completed/,
@@ -236,8 +260,8 @@ do_dump_test(
 qr/package DBICTest::DumpMore::1::Foo;/,
 qr/=head1 NAME\n\nDBICTest::DumpMore::1::Foo\n\n=cut\n\n/,
 qr/=head1 ACCESSORS\n\n/,
-qr/=head2 fooid\n\n  data_type: 'INTEGER'\n  default_value: undef\n  is_nullable: 1\n  size: undef\n\n/,
-qr/=head2 footext\n\n  data_type: 'TEXT'\n  default_value: 'footext'\n  extra: {is_footext => 1}\n  is_nullable: 1\n  size: undef\n\n/,
+qr/=head2 fooid\n\n  data_type: 'integer'\n  is_auto_increment: 1\n  is_nullable: 1\n\n/,
+qr/=head2 footext\n\n  data_type: 'text'\n  default_value: 'footext'\n  extra: {is_footext => 1}\n  is_nullable: 1\n\n/,
 qr/->set_primary_key/,
 qr/=head1 RELATIONS\n\n/,
 qr/=head2 bars\n\nType: has_many\n\nRelated object: L<DBICTest::DumpMore::1::Bar>\n\n=cut\n\n/,
@@ -247,8 +271,8 @@ qr/1;\n$/,
 qr/package DBICTest::DumpMore::1::Bar;/,
 qr/=head1 NAME\n\nDBICTest::DumpMore::1::Bar\n\n=cut\n\n/,
 qr/=head1 ACCESSORS\n\n/,
-qr/=head2 barid\n\n  data_type: 'INTEGER'\n  default_value: undef\n  is_nullable: 1\n  size: undef\n\n/,
-qr/=head2 fooref\n\n  data_type: 'INTEGER'\n  default_value: undef\n  is_foreign_key: 1\n  is_nullable: 1\n  size: undef\n\n/,
+qr/=head2 barid\n\n  data_type: 'integer'\n  is_auto_increment: 1\n  is_nullable: 1\n\n/,
+qr/=head2 fooref\n\n  data_type: 'integer'\n  is_foreign_key: 1\n  is_nullable: 1\n\n/,
 qr/->set_primary_key/,
 qr/=head1 RELATIONS\n\n/,
 qr/=head2 fooref\n\nType: belongs_to\n\nRelated object: L<DBICTest::DumpMore::1::Foo>\n\n=cut\n\n/,
@@ -261,8 +285,6 @@ append_to_class('DBICTest::DumpMore::1::Foo',q{# XXX This is my custom content X
 
 do_dump_test(
     classname => 'DBICTest::DumpMore::1',
-    options => { },
-    error => '',
     warnings => [
         qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
         qr/Schema dump completed/,
@@ -288,7 +310,6 @@ do_dump_test(
 do_dump_test(
     classname => 'DBICTest::DumpMore::1',
     options => { really_erase_my_files => 1 },
-    error => '',
     warnings => [
         qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
         qr/Deleting existing file /,
@@ -319,10 +340,11 @@ do_dump_test(
     },
 );
 
+rmtree($DUMP_PATH, 1, 1);
+
 do_dump_test(
     classname => 'DBICTest::DumpMore::1',
     options => { use_namespaces => 1, generate_pod => 0 },
-    error => '',
     warnings => [
         qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
         qr/Schema dump completed/,
@@ -334,10 +356,11 @@ do_dump_test(
     },
 );
 
+rmtree($DUMP_PATH, 1, 1);
+
 do_dump_test(
     classname => 'DBICTest::DumpMore::1',
     options => { use_namespaces => 1 },
-    error => '',
     warnings => [
         qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
         qr/Schema dump completed/,
@@ -360,6 +383,8 @@ do_dump_test(
     },
 );
 
+rmtree($DUMP_PATH, 1, 1);
+
 do_dump_test(
     classname => 'DBICTest::DumpMore::1',
     options => { use_namespaces => 1,
@@ -367,7 +392,6 @@ do_dump_test(
                  resultset_namespace => 'RSet',
                  default_resultset_class => 'RSetBase',
              },
-    error => '',
     warnings => [
         qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
         qr/Schema dump completed/,
@@ -393,6 +417,8 @@ do_dump_test(
     },
 );
 
+rmtree($DUMP_PATH, 1, 1);
+
 do_dump_test(
     classname => 'DBICTest::DumpMore::1',
     options => { use_namespaces => 1,
@@ -402,7 +428,6 @@ do_dump_test(
                  result_base_class => 'My::ResultBaseClass',
                  schema_base_class => 'My::SchemaBaseClass',
              },
-    error => '',
     warnings => [
         qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
         qr/Schema dump completed/,
@@ -431,6 +456,8 @@ do_dump_test(
     },
 );
 
+rmtree($DUMP_PATH, 1, 1);
+
 do_dump_test(
     classname => 'DBICTest::DumpMore::1',
     options   => {