From: Peter Rabbitson <ribasushi@cpan.org>
Date: Tue, 25 Oct 2011 09:08:22 +0000 (+0200)
Subject: Pass tests with DBICTEST_SQLITE_USE_FILE set
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6ddb4ac0da84a99b4e563a8c828dd3dc25a0aa11;p=dbsrgits%2FDBIx-Class-Historic.git

Pass tests with DBICTEST_SQLITE_USE_FILE set
---

diff --git a/Changes b/Changes
index 42a4af1..0dc66eb 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@ Revision history for DBIx::Class
 
     * Fixes
         - Fix tests for DBD::SQLite >= 1.34.
+        - Fix test failures with DBICTEST_SQLITE_USE_FILE set
         - Fix the find() condition heuristics being invoked even when the
           call defaults to 'primary' (i.e. when invoked with bare values)
         - Throw much clearer error on incorrect inflation spec
diff --git a/t/86sqlt.t b/t/86sqlt.t
index 961ca27..76e759d 100644
--- a/t/86sqlt.t
+++ b/t/86sqlt.t
@@ -22,11 +22,10 @@ sub DBICTest::Schema::deployment_statements {
   return $self->next::method(@_);
 }
 
-my $schema = DBICTest->init_schema (no_deploy => 1);
-
 
 # Check deployment statements ctx sensitivity
 {
+  my $schema = DBICTest->init_schema (no_deploy => 1);
   my $not_first_table_creation_re = qr/CREATE TABLE fourkeys_to_twokeys/;
 
   my $statements = $schema->deployment_statements;
@@ -84,6 +83,8 @@ my $schema = DBICTest->init_schema (no_deploy => 1);
   ok($component_deploy_hook_called, 'component deploy hook got called');
 }
 
+my $schema = DBICTest->init_schema (no_deploy => 1);
+
 {
   my $deploy_hook_called = 0;
   $custom_deployment_statements_called = 0;
diff --git a/t/99dbic_sqlt_parser.t b/t/99dbic_sqlt_parser.t
index ce103d1..87e4d68 100644
--- a/t/99dbic_sqlt_parser.t
+++ b/t/99dbic_sqlt_parser.t
@@ -30,7 +30,8 @@ BEGIN {
 lives_ok { isa_ok (create_schema ({ schema => 'DBICTest::Schema' }), 'SQL::Translator::Schema', 'SQLT schema object produced') };
 
 
-my $schema = DBICTest->init_schema();
+my $schema = DBICTest->init_schema( no_deploy => 1 );
+
 # Dummy was yanked out by the sqlt hook test
 # CustomSql tests the horrific/deprecated ->name(\$sql) hack
 # YearXXXXCDs are views
diff --git a/t/storage/debug.t b/t/storage/debug.t
index ab70122..5fd62f5 100644
--- a/t/storage/debug.t
+++ b/t/storage/debug.t
@@ -10,7 +10,7 @@ use DBIC::DebugObj;
 use DBIC::SqlMakerTest;
 use Path::Class qw/file/;
 
-BEGIN { delete @ENV{qw(DBIC_TRACE_PROFILE)} }
+BEGIN { delete @ENV{qw(DBIC_TRACE_PROFILE DBICTEST_SQLITE_USE_FILE)} }
 
 my $schema = DBICTest->init_schema();