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

caelum at dev.catalyst.perl.org caelum at dev.catalyst.perl.org
Mon Nov 30 16:35:46 GMT 2009


Author: caelum
Date: 2009-11-30 16:35:46 +0000 (Mon, 30 Nov 2009)
New Revision: 7996

Modified:
   branches/DBIx-Class-Schema-Loader/current/Changes
   branches/DBIx-Class-Schema-Loader/current/Makefile.PL
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
   branches/DBIx-Class-Schema-Loader/current/t/11mysql_common.t
Log:
fix MySQL rel introspection with on_connect_call => "set_strict_mode" (RT#52087)

Modified: branches/DBIx-Class-Schema-Loader/current/Changes
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Changes	2009-11-30 15:20:19 UTC (rev 7995)
+++ branches/DBIx-Class-Schema-Loader/current/Changes	2009-11-30 16:35:46 UTC (rev 7996)
@@ -1,5 +1,9 @@
 Revision history for Perl extension DBIx::Class::Schema::Loader
 
+        - fix MySQL rel introspection with on_connect_call =>
+          'set_strict_mode' (RT#52087)
+        - now using base 'DBIx::Class::Core' for Results (RT#52141)
+
 0.04999_11  2009-11-29 18:08:46
         - added patch to generate POD from postgres by Andrey Kostenko (GUGU)
         - added test for norewrite feature

Modified: branches/DBIx-Class-Schema-Loader/current/Makefile.PL
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Makefile.PL	2009-11-30 15:20:19 UTC (rev 7995)
+++ branches/DBIx-Class-Schema-Loader/current/Makefile.PL	2009-11-30 16:35:46 UTC (rev 7996)
@@ -22,7 +22,7 @@
 requires 'Class::C3::Componentised'    => '1.0005';
 requires 'Carp::Clan'                  => 0;
 requires 'Class::Inspector'            => 0;
-requires 'DBIx::Class'                 => '0.08109';
+requires 'DBIx::Class'                 => '0.08114';
 requires 'Class::Unload'               => 0;
 
 install_script 'script/dbicdump';

Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm	2009-11-30 15:20:19 UTC (rev 7995)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm	2009-11-30 16:35:46 UTC (rev 7996)
@@ -27,20 +27,10 @@
 
 =cut
 
-# had to override here because MySQL apparently
-#  doesn't support '%' syntax.  Perhaps the other
-#  drivers support this syntax also, but I didn't
-#  want to risk breaking some esoteric DBD::foo version
-#  in a maint release...
 sub _tables_list { 
     my $self = shift;
 
-    my $dbh = $self->schema->storage->dbh;
-    my @tables = $dbh->tables(undef, $self->db_schema, undef, undef);
-    s/\Q$self->{_quoter}\E//g for @tables;
-    s/^.*\Q$self->{_namesep}\E// for @tables;
-
-    return @tables;
+    return $self->next::method(undef, undef);
 }
 
 sub _table_fk_info {
@@ -50,19 +40,23 @@
     my $table_def_ref = $dbh->selectrow_arrayref("SHOW CREATE TABLE `$table`")
         or croak ("Cannot get table definition for $table");
     my $table_def = $table_def_ref->[1] || '';
-    
-    my (@reldata) = ($table_def =~ /CONSTRAINT `.*` FOREIGN KEY \(`(.*)`\) REFERENCES `(.*)` \(`(.*)`\)/ig);
 
+    my $qt = qr/["`]/;
+
+    my (@reldata) = ($table_def =~
+        /CONSTRAINT $qt.*$qt FOREIGN KEY \($qt(.*)$qt\) REFERENCES $qt(.*)$qt \($qt(.*)$qt\)/ig
+    );
+
     my @rels;
     while (scalar @reldata > 0) {
         my $cols = shift @reldata;
         my $f_table = shift @reldata;
         my $f_cols = shift @reldata;
 
-        my @cols   = map { s/\Q$self->{_quoter}\E//; lc $_ }
+        my @cols   = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; lc $_ }
             split(/\s*,\s*/, $cols);
 
-        my @f_cols = map { s/\Q$self->{_quoter}\E//; lc $_ }
+        my @f_cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; lc $_ }
             split(/\s*,\s*/, $f_cols);
 
         push(@rels, {

Modified: branches/DBIx-Class-Schema-Loader/current/t/11mysql_common.t
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/t/11mysql_common.t	2009-11-30 15:20:19 UTC (rev 7995)
+++ branches/DBIx-Class-Schema-Loader/current/t/11mysql_common.t	2009-11-30 16:35:46 UTC (rev 7996)
@@ -17,6 +17,7 @@
     dsn              => $dsn,
     user             => $user,
     password         => $password,
+    connect_info_opts=> { on_connect_call => 'set_strict_mode' },
     skip_rels        => $test_innodb ? 0 : $skip_rels_msg,
     no_inline_rels   => 1,
     no_implicit_rels => 1,




More information about the Bast-commits mailing list