change test env vars to match DBIx::Class

diff --git a/t/11mysql_common.t b/t/11mysql_common.t
index df7b08e..1929a68 100644 (file)
--- a/t/11mysql_common.t
+++ b/t/11mysql_common.t
@@ -2,26 +2,26 @@ use strict;
 use lib qw( . ./t );
 use dbixcsl_common_tests;
 
-my $database    = $ENV{MYSQL_NAME} || '';
-my $user        = $ENV{MYSQL_USER} || '';
-my $password    = $ENV{MYSQL_PASS} || '';
-my $test_innodb = $ENV{MYSQL_TEST_INNODB} || 0;
+my $dsn         = $ENV{DBICTEST_MYSQL_DSN} || '';
+my $user        = $ENV{DBICTEST_MYSQL_USER} || '';
+my $password    = $ENV{DBICTEST_MYSQL_PASS} || '';
+my $test_innodb = $ENV{DBICTEST_MYSQL_INNODB} || 0;
 
-my $skip_rels_msg = 'You need to set the MYSQL_TEST_INNODB environment variable to test relationships';
+my $skip_rels_msg = 'You need to set the DBICTEST_MYSQL_INNODB environment variable to test relationships';
 
 my $tester = dbixcsl_common_tests->new(
     vendor          => 'Mysql',
     auto_inc_pk     => 'INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT',
     innodb          => q{Engine='InnoDB'},
-    dsn             => "dbi:mysql:$database",
+    dsn             => $dsn,
     user            => $user,
     password        => $password,
     skip_rels       => $test_innodb ? 0 : $skip_rels_msg,
     no_inline_rels  => 1,
 );
 
-if( !$database || !$user ) {
-    $tester->skip_tests('You need to set the MYSQL_NAME, MYSQL_USER and MYSQL_PASS environment variables');
+if( !$dsn || !$user ) {
+    $tester->skip_tests('You need to set the DBICTEST_MYSQL_DSN, _USER, and _PASS environment variables');
 }
 else {
     $tester->run_tests();

diff --git a/t/12pg_common.t b/t/12pg_common.t
index 198ad92..92ba833 100644 (file)
--- a/t/12pg_common.t
+++ b/t/12pg_common.t
@@ -2,20 +2,20 @@ use strict;
 use lib qw( . ./t );
 use dbixcsl_common_tests;
 
-my $database = $ENV{PG_NAME} || '';
-my $user     = $ENV{PG_USER} || '';
-my $password = $ENV{PG_PASS} || '';
+my $dsn      = $ENV{DBICTEST_PG_DSN} || '';
+my $user     = $ENV{DBICTEST_PG_USER} || '';
+my $password = $ENV{DBICTEST_PG_PASS} || '';
 
 my $tester = dbixcsl_common_tests->new(
     vendor      => 'Pg',
     auto_inc_pk => 'SERIAL NOT NULL PRIMARY KEY',
-    dsn         => "dbi:Pg:dbname=$database",
+    dsn         => $dsn,
     user        => $user,
     password    => $password,
 );
 
-if( !$database || !$user ) {
-    $tester->skip_tests('You need to set the PG_NAME, PG_USER and PG_PASS environment variables');
+if( !$dsn || !$user ) {
+    $tester->skip_tests('You need to set the DBICTEST_PG_DSN, _USER, and _PASS environment variables');
 }
 else {
     $tester->run_tests();

diff --git a/t/13db2_common.t b/t/13db2_common.t
index 862f2fd..1619968 100644 (file)
--- a/t/13db2_common.t
+++ b/t/13db2_common.t
@@ -2,22 +2,22 @@ use strict;
 use lib qw( . ./t );
 use dbixcsl_common_tests;
 
-my $database = $ENV{DB2_NAME} || '';
-my $user     = $ENV{DB2_USER} || '';
-my $password = $ENV{DB2_PASS} || '';
+my $dsn      = $ENV{DBICTEST_DB2_DSN} || '';
+my $user     = $ENV{DBICTEST_DB2_USER} || '';
+my $password = $ENV{DBICTEST_DB2_PASS} || '';
 
 my $tester = dbixcsl_common_tests->new(
     vendor         => 'DB2',
     auto_inc_pk    => 'INTEGER GENERATED BY DEFAULT AS IDENTITY NOT NULL PRIMARY KEY',
-    dsn            => "dbi:DB2:$database",
+    dsn            => $dsn,
     user           => $user,
     password       => $password,
     db_schema      => $user,
     drop_db_schema => 1,
 );
 
-if( !$database || !$user ) {
-    $tester->skip_tests('You need to set the DB2_NAME, DB2_USER and DB2_PASS environment variables');
+if( !$dsn || !$user ) {
+    $tester->skip_tests('You need to set the DBICTEST_DB2_DSN, _USER, and _PASS environment variables');
 }
 else {
     $tester->run_tests();