[Catalyst-commits] r6182 - in trunk/Class-DBI-Loader: . lib/Class/DBI lib/Class/DBI/Loader

[daisuke at dev.catalyst.perl.org]

Author: daisuke
Date: 2007-03-22 12:13:43 +0000 (Thu, 22 Mar 2007)
New Revision: 6182

Modified:
   trunk/Class-DBI-Loader/Changes
   trunk/Class-DBI-Loader/lib/Class/DBI/Loader.pm
   trunk/Class-DBI-Loader/lib/Class/DBI/Loader/mysql.pm
Log:
Apply patch by Kim Scheibel to allow mysql table with catalog name separators


Modified: trunk/Class-DBI-Loader/Changes
===================================================================
--- trunk/Class-DBI-Loader/Changes	2007-03-21 17:17:28 UTC (rev 6181)
+++ trunk/Class-DBI-Loader/Changes	2007-03-22 12:13:43 UTC (rev 6182)
@@ -1,6 +1,10 @@
 Revision history for Perl extension Class::DBI::Loader
 
-0.33
+0.34  Thu Mar 22 20:30:00 2007
+       - Apply patch by Kim Scheibel to allow mysql table with catalog
+         name separators
+
+0.33  Thu May 25 00:00:00 2006
        - Implement the 'require' parameter. Suggested by esh at exile.ru
 
 0.32  Sun Mar 05 01:10:00 2006

Modified: trunk/Class-DBI-Loader/lib/Class/DBI/Loader/mysql.pm
===================================================================
--- trunk/Class-DBI-Loader/lib/Class/DBI/Loader/mysql.pm	2007-03-21 17:17:28 UTC (rev 6181)
+++ trunk/Class-DBI-Loader/lib/Class/DBI/Loader/mysql.pm	2007-03-22 12:13:43 UTC (rev 6182)
@@ -92,6 +92,10 @@
     my $dbh = DBI->connect( @{ $self->{_datasource} } ) or croak($DBI::errstr);
     my @tables;
     foreach my $table ( $dbh->tables ) {
+        if(my $catalog_sep = quotemeta($dbh->get_info(41))) {
+          $table = (split($catalog_sep, $table))[-1]
+            if $table =~ m/$catalog_sep/;
+        }
         my $quoter = $dbh->get_info(29);
         $table =~ s/$quoter//g if ($quoter);
         push @tables, $1

Modified: trunk/Class-DBI-Loader/lib/Class/DBI/Loader.pm
===================================================================
--- trunk/Class-DBI-Loader/lib/Class/DBI/Loader.pm	2007-03-21 17:17:28 UTC (rev 6181)
+++ trunk/Class-DBI-Loader/lib/Class/DBI/Loader.pm	2007-03-22 12:13:43 UTC (rev 6182)
@@ -3,7 +3,7 @@
 use strict;
 use vars '$VERSION';
 
-$VERSION = '0.33';
+$VERSION = '0.34';
 
 =head1 NAME