fix bug in qualify_objects that would add schema to relnames

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

diff --git a/t/23dumpmore.t b/t/23dumpmore.t
index 8ca8acc..ea5fd6b 100644 (file)
--- a/t/23dumpmore.t
+++ b/t/23dumpmore.t
@@ -174,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/,
@@ -191,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/,
@@ -217,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/,
@@ -251,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/,
@@ -265,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  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/=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/,
@@ -276,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  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/=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/,
@@ -290,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/,
@@ -317,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 /,
@@ -348,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/,
@@ -363,10 +356,29 @@ do_dump_test(
     },
 );
 
+rmtree($DUMP_PATH, 1, 1);
+
+do_dump_test(
+    classname => 'DBICTest::DumpMore::1',
+    options => { db_schema => 'foo_schema', qualify_objects => 1, use_namespaces => 1 },
+    warnings => [
+        qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+        qr/Schema dump completed/,
+    ],
+    regexes => {
+        'Result/Foo' => [
+            qr/^\Q__PACKAGE__->table("foo_schema.foo");\E/m,
+            # the has_many relname should not have the schema in it!
+            qr/^__PACKAGE__->has_many\(\n  "bars"/m,
+        ],
+    },
+);
+
+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/,
@@ -389,6 +401,8 @@ do_dump_test(
     },
 );
 
+rmtree($DUMP_PATH, 1, 1);
+
 do_dump_test(
     classname => 'DBICTest::DumpMore::1',
     options => { use_namespaces => 1,
@@ -396,7 +410,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/,
@@ -422,6 +435,8 @@ do_dump_test(
     },
 );
 
+rmtree($DUMP_PATH, 1, 1);
+
 do_dump_test(
     classname => 'DBICTest::DumpMore::1',
     options => { use_namespaces => 1,
@@ -431,7 +446,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/,
@@ -460,6 +474,8 @@ do_dump_test(
     },
 );
 
+rmtree($DUMP_PATH, 1, 1);
+
 do_dump_test(
     classname => 'DBICTest::DumpMore::1',
     options   => {
@@ -472,3 +488,4 @@ do_dump_test(
 done_testing;
 
 END { rmtree($DUMP_PATH, 1, 1) unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP} }
+# vim:et sts=4 sw=4 tw=0: