X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F10_09firebird_common.t;h=50b74be6c81427ef608b519254b42f59861b1234;hb=d7e0e0e8e9517098567f1a5637771505476ccbc1;hp=1a044d176a8bbcef435b63c1d9736300d7800bfa;hpb=7336f5dc45f7b330b6ea21b31edb3591de0b2d40;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/10_09firebird_common.t b/t/10_09firebird_common.t
index 1a044d1..50b74be 100644
--- a/t/10_09firebird_common.t
+++ b/t/10_09firebird_common.t
@@ -22,7 +22,7 @@ for (qw(FIREBIRD FIREBIRD_ODBC FIREBIRD_INTERBASE)) {
     $dsns{$_}{user} = $ENV{"DBICTEST_${_}_USER"};
     $dsns{$_}{password} = $ENV{"DBICTEST_${_}_PASS"};
     $dsns{$_}{connect_info_opts} = { on_connect_call => 'use_softcommit' }
-        if /\AFIREBIRD(?:_INTERBASE)\z/;
+        if /\AFIREBIRD(?:_INTERBASE)?\z/;
 };
 
 plan skip_all => 'You need to set the DBICTEST_FIREBIRD_DSN, _USER and _PASS and/or the DBICTEST_FIREBIRD_ODBC_DSN, _USER and _PASS and/or the DBICTEST_FIREBIRD_INTERBASE_DSN, _USER and _PASS environment variables'
@@ -120,39 +120,46 @@ my $tester = dbixcsl_common_tests->new(
                       => { data_type => 'blob sub_type text character set unicode_fss' },
     },
     extra => {
-        count  => 9,
+        count  => 11,
+        create => [
+            q{
+                CREATE TABLE "Firebird_Loader_Test1" (
+                    "Id" INTEGER NOT NULL PRIMARY KEY,
+                    "Foo" INTEGER DEFAULT 42
+                )
+            },
+            q{
+                CREATE GENERATOR "Gen_Firebird_Loader_Test1_Id"
+            },
+            q{
+                CREATE TRIGGER "Firebird_Loader_Test1_BI" for "Firebird_Loader_Test1"
+                ACTIVE BEFORE INSERT POSITION 0
+                AS
+                BEGIN
+                 IF (NEW."Id" IS NULL) THEN
+                  NEW."Id" = GEN_ID("Gen_Firebird_Loader_Test1_Id",1);
+                END
+            },
+            q{
+                CREATE VIEW firebird_loader_test2 AS SELECT * FROM "Firebird_Loader_Test1"
+            },
+        ],
+        pre_drop_ddl => [
+            'DROP VIEW firebird_loader_test2',
+            'DROP TRIGGER "Firebird_Loader_Test1_BI"',
+            'DROP GENERATOR "Gen_Firebird_Loader_Test1_Id"',
+            'DROP TABLE "Firebird_Loader_Test1"',
+        ],
         run    => sub {
             $schema = shift;
             my ($monikers, $classes, $self) = @_;
 
-            cleanup_extra();
-
             my $dbh = $schema->storage->dbh;
 
 # create a mixed case table
             $dbh->do($_) for (
-q{
-    CREATE TABLE "Firebird_Loader_Test1" (
-        "Id" INTEGER NOT NULL PRIMARY KEY,
-        "Foo" INTEGER DEFAULT 42
-    )
-},
-q{
-    CREATE GENERATOR "Gen_Firebird_Loader_Test1_Id"
-},
-q{
-    CREATE TRIGGER "Firebird_Loader_Test1_BI" for "Firebird_Loader_Test1"
-    ACTIVE BEFORE INSERT POSITION 0
-    AS
-    BEGIN
-     IF (NEW."Id" IS NULL) THEN
-      NEW."Id" = GEN_ID("Gen_Firebird_Loader_Test1_Id",1);
-    END
-},
             );
 
-            my $guard = Scope::Guard->new(\&cleanup_extra);
-
             local $schema->loader->{preserve_case} = 1;
             $schema->loader->_setup;
 
@@ -172,6 +179,15 @@ q{
 
             is eval { $rsrc->column_info('Foo')->{default_value} }, 42, 'default_value detected for mixed case column';
 
+            # test that views are marked as such
+            my $view_source = $schema->resultset($monikers->{firebird_loader_test2})->result_source;
+            isa_ok $view_source, 'DBIx::Class::ResultSource::View',
+                'view result source';
+
+            like $view_source->view_definition,
+                qr/\A \s* select\b .* \bfrom \s+ (?-i:"Firebird_Loader_Test1") \s* \z/imsx,
+                'view definition';
+
             # test the fixed up ->_dbh_type_info_type_name for the ODBC driver
             if ($schema->storage->_dbi_connect_info->[0] =~ /:ODBC:/i) {
                 my %truncated_types = (
@@ -207,16 +223,4 @@ q{
     $tester->run_tests();
 }
 
-sub cleanup_extra {
-    $schema->storage->disconnect;
-    my $dbh = $schema->storage->dbh;
-
-    foreach my $stmt (
-        'DROP TRIGGER "Firebird_Loader_Test1_BI"',
-        'DROP GENERATOR "Gen_Firebird_Loader_Test1_Id"',
-        'DROP TABLE "Firebird_Loader_Test1"',
-    ) {
-        eval { $dbh->do($stmt) };
-    }
-}
 # vim:et sts=4 sw=4 tw=0: