[Bast-commits] r6564 - in branches/DBIx-Class-Schema-Loader/current: . lib/DBIx/Class/Schema/Loader/DBI t

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-06-09 13:26:29 +0000 (Tue, 09 Jun 2009)
New Revision: 6564

Added:
   branches/DBIx-Class-Schema-Loader/current/t/16mssql_odbc_common.t
Modified:
   branches/DBIx-Class-Schema-Loader/current/
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
Log:
 r5245 at hlagh (orig r6437):  caelum | 2009-05-26 21:27:41 -0700
 added test for mssql_odbc



Property changes on: branches/DBIx-Class-Schema-Loader/current
___________________________________________________________________
Name: svk:merge
   - 46bc3436-8211-0410-8564-d96f7a728040:/local/DBIx-Class-Schema-Loader/branches/common-dump:37173
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-Schema-Loader/odbc-mssql:6425
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/trunk/DBIx-Class-Schema-Loader:5726
   + 46bc3436-8211-0410-8564-d96f7a728040:/local/DBIx-Class-Schema-Loader/branches/common-dump:37173
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-Schema-Loader/odbc-mssql:6437
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/trunk/DBIx-Class-Schema-Loader:5726

Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm	2009-06-09 13:26:01 UTC (rev 6563)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm	2009-06-09 13:26:29 UTC (rev 6564)
@@ -35,7 +35,7 @@
     # Translate the backend name into a perl identifier
     $dbtype =~ s/\W/_/gi;
     my $class = "DBIx::Class::Schema::Loader::DBI::ODBC::${dbtype}";
-    eval "require $class";
+    eval { $self->ensure_class_loaded($class) };
     bless $self, $class unless $@;
   }
 }

Added: branches/DBIx-Class-Schema-Loader/current/t/16mssql_odbc_common.t
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/t/16mssql_odbc_common.t	                        (rev 0)
+++ branches/DBIx-Class-Schema-Loader/current/t/16mssql_odbc_common.t	2009-06-09 13:26:29 UTC (rev 6564)
@@ -0,0 +1,23 @@
+use strict;
+use lib qw(t/lib);
+use dbixcsl_common_tests;
+
+my $dsn      = $ENV{DBICTEST_MSSQL_ODBC_DSN} || '';
+my $user     = $ENV{DBICTEST_MSSQL_ODBC_USER} || '';
+my $password = $ENV{DBICTEST_MSSQL_ODBC_PASS} || '';
+
+my $tester = dbixcsl_common_tests->new(
+    vendor      => 'Microsoft',
+    quote_char  => [qw/[ ]/],
+    auto_inc_pk => 'INTEGER IDENTITY NOT NULL PRIMARY KEY',
+    dsn         => $dsn,
+    user        => $user,
+    password    => $password,
+);
+
+if( !$dsn || !$user ) {
+    $tester->skip_tests('You need to set the DBICTEST_MSSQL_ODBC_DSN, _USER, and _PASS environment variables');
+}
+else {
+    $tester->run_tests();
+}