X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F10_02mysql_common.t;h=e850cbf1b2b95b4dec2be00168e00f18510491d0;hb=4fb2971cd5784d8bc64f98052e691db9df697516;hp=b251dc7ba372cddcf98c13d4961bcf9b85ea1c4e;hpb=958d5fcfc75fc334524e17147b07fb5acfdfee26;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/10_02mysql_common.t b/t/10_02mysql_common.t
index b251dc7..e850cbf 100644
--- a/t/10_02mysql_common.t
+++ b/t/10_02mysql_common.t
@@ -4,6 +4,7 @@ use Test::More;
 use Test::Exception;
 use Try::Tiny;
 use File::Path 'rmtree';
+use DBIx::Class::Optional::Dependencies;
 use DBIx::Class::Schema::Loader::Utils 'slurp_file';
 use DBIx::Class::Schema::Loader 'make_schema_at';
 
@@ -136,14 +137,17 @@ my $tester = dbixcsl_common_tests->new(
         'longblob'    => { data_type => 'longblob' },
         'longtext'    => { data_type => 'longtext' },
 
-        "enum('foo','bar','baz')"
-                      => { data_type => 'enum', extra => { list => [qw/foo bar baz/] } },
-        "enum('foo \\'bar\\' baz', 'foo ''bar'' quux')"
-                      => { data_type => 'enum', extra => { list => [q{foo 'bar' baz}, q{foo 'bar' quux}] } },
-        "set('foo \\'bar\\' baz', 'foo ''bar'' quux')"
-                      => { data_type => 'set', extra => { list => [q{foo 'bar' baz}, q{foo 'bar' quux}] } },
-        "set('foo','bar','baz')"
-                      => { data_type => 'set',  extra => { list => [qw/foo bar baz/] } },
+        ( map {
+            "$_('','foo','bar','baz')"
+                      => { data_type => $_, extra => { list => ['', qw/foo bar baz/] } },
+            "$_('foo \\'bar\\' baz', 'foo ''bar'' quux')"
+                      => { data_type => $_, extra => { list => [q{foo 'bar' baz}, q{foo 'bar' quux}] } },
+            "$_('''', '''foo', 'bar''')"
+                      => { data_type => $_, extra => { list => [qw(' 'foo bar')] } },
+            "$_('\\'', '\\'foo', 'bar\\'')",
+                      => { data_type => $_, extra => { list => [qw(' 'foo bar')] } },
+            } qw(set enum)
+        ),
 
         # RT#68717
         "enum('11,10 (<500)/0 DUN','4,90 (<120)/0 EUR') NOT NULL default '11,10 (<500)/0 DUN'"
@@ -198,7 +202,7 @@ my $tester = dbixcsl_common_tests->new(
         ],
         pre_drop_ddl => [ 'DROP VIEW mysql_loader_test2', ],
         drop => [ 'mysql_loader-test1', 'mysql_loader_test3', 'mysql_loader_test11', 'mysql_loader_test12' ],
-        count => 8 + 30 * 2,
+        count => 9 + 30 * 2,
         run => sub {
             my ($monikers, $classes);
             ($schema, $monikers, $classes) = @_;
@@ -211,6 +215,10 @@ my $tester = dbixcsl_common_tests->new(
             is $rsrc->column_info('value')->{data_type}, 'varchar',
                 'view introspected successfully';
 
+            # test that views are marked as such
+            isa_ok $schema->resultset($monikers->{mysql_loader_test2})->result_source, 'DBIx::Class::ResultSource::View',
+                'views have table_class set correctly';
+
             $rsrc = $schema->source('MysqlLoaderTest3');
 
             is_deeply $rsrc->column_info('del_group')->{extra}{list}, ['19,90 (<500)/0 EUR','4,90 (<120)/0 EUR','7,90 (<200)/0 CHF','300 (<6000)/0 CZK','4,90 (<100)/0 EUR','39 (<900)/0 DKK','299 (<5000)/0 EEK','9,90 (<250)/0 EUR','3,90 (<100)/0 GBP','3000 (<70000)/0 HUF','4000 (<70000)/0 JPY','13,90 (<200)/0 LVL','99 (<2500)/0 NOK','39 (<1000)/0 PLN','1000 (<20000)/0 RUB','49 (<2500)/0 SEK','29 (<600)/0 USD','19,90 (<600)/0 EUR','0 EUR','0 CHF'],
@@ -245,7 +253,7 @@ my $tester = dbixcsl_common_tests->new(
                     $dbh->do('CREATE DATABASE `dbicsl-test`');
                 }
                 catch {
-                    diag "CREATE DATABASE returned error: '$_'";
+                    note "CREATE DATABASE returned error: '$_'";
                     skip "no CREATE DATABASE privileges", 30 * 2;
                 };
 
@@ -497,6 +505,9 @@ EOF
 if( !$dsn || !$user ) {
     $tester->skip_tests('You need to set the DBICTEST_MYSQL_DSN, DBICTEST_MYSQL_USER, and DBICTEST_MYSQL_PASS environment variables');
 }
+elsif (!DBIx::Class::Optional::Dependencies->req_ok_for ('rdbms_mysql')) {
+    $tester->skip_tests('You need to install ' . DBIx::Class::Optional::Dependencies->req_missing_for ('rdbms_mysql'));
+}
 else {
     diag $skip_rels_msg if not $test_innodb;
     $tester->run_tests();