Made testing suitable for another databases too

vti · Oct 26, 2011 · 91c95d2 · 91c95d2
1 parent d0a02bc
commit 91c95d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/t/lib/TestDB.pm b/t/lib/TestDB.pm
@@ -16,9 +16,9 @@ sub dbh {
 
     my @args = ();
 
-    if ($ENV{TEST_MYSQL}) {
-        my @options = split(',', $ENV{TEST_MYSQL});
-        push @args, 'dbi:mysql:' . shift @options, @options;
+    if ($ENV{TEST_DSN}) {
+        my @options = split(',', $ENV{TEST_DSN});
+        push @args, 'dbi:' . (shift @options) . ':', @options;
     }
     else {
         push @args, 'dbi:SQLite:' . ':memory:';
@@ -27,7 +27,7 @@ sub dbh {
     my $dbh = DBI->connect(@args);
     die $DBI::errorstr unless $dbh;
 
-    unless ($ENV{TEST_MYSQL}) {
+    unless ($ENV{TEST_DSN}) {
         $dbh->do("PRAGMA default_synchronous = OFF");
         $dbh->do("PRAGMA temp_store = MEMORY");
     }

diff --git a/t/lib/TestEnv.pm b/t/lib/TestEnv.pm
@@ -14,20 +14,7 @@ sub setup {
     my $driver = $dbh->{'Driver'}->{'Name'};
     return unless $driver eq 'SQLite';
 
-    my $filename;
-    if ($driver =~ m/SQLite/) {
-        $filename = 'sqlite';
-    }
-    elsif ($driver =~ m/mysql/) {
-        $filename = 'mysql';
-    }
-    else {
-        die "Unknown driver $driver";
-    }
-
-    my $fullpath = "$FindBin::Bin/schema/$filename.sql";
-    $fullpath = "$FindBin::Bin/../schema/$filename.sql"
-      unless -e $fullpath;
+    my $fullpath = "$FindBin::Bin/schema/$driver.sql";
 
     open(my $file, "<$fullpath") or die "Can't open $fullpath: $!";
 

diff --git a/t/schema/sqlite.sql → t/schema/SQLite.sql b/t/schema/sqlite.sql → t/schema/SQLite.sql