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

[blblack at dev.catalyst.perl.org]

Author: blblack
Date: 2007-03-29 14:44:16 +0100 (Thu, 29 Mar 2007)
New Revision: 3149

Modified:
   branches/DBIx-Class-Schema-Loader/current/
   branches/DBIx-Class-Schema-Loader/current/Changes
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader.pm
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI.pm
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
Log:
 r20620 at brandon-blacks-computer (orig r3074):  ash | 2007-02-04 09:20:47 -0600
 Fixed quoting problem in _table_columns
 r27318 at brandon-blacks-computer (orig r3147):  blblack | 2007-03-29 08:16:30 -0500
 fixed compat problems w/ DBD::mysql 4.002+, bumped version to 0.03010 for release



Property changes on: branches/DBIx-Class-Schema-Loader/current
___________________________________________________________________
Name: svk:merge
   - bd8105ee-0ff8-0310-8827-fb3f25b6796d:/trunk/DBIx-Class-Schema-Loader:2888
   + bd8105ee-0ff8-0310-8827-fb3f25b6796d:/trunk/DBIx-Class-Schema-Loader:3147

Modified: branches/DBIx-Class-Schema-Loader/current/Changes
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Changes	2007-03-29 13:42:27 UTC (rev 3148)
+++ branches/DBIx-Class-Schema-Loader/current/Changes	2007-03-29 13:44:16 UTC (rev 3149)
@@ -6,9 +6,16 @@
         - Removed previously deprecated methods/options
         - Added $VERSION to all packages in this dist
 
+0.03010 Thu Mar 29 12:36:19 UTC 2007
+        - Workaround for new incompatible changes in DBD::mysql's "tables"
+          method, which was causing us to find no tables w/ DBD::mysql
+          4.002+
+        - Fixed quoting problem in _table_columns (could cause crash when 
+          dumping/doing a static create) (from ash)
+
 0.03009 Wed Nov 15 14:03:37 UTC 2006
-	- fix for rt.cpan.org #22425 (use File::Spec where appropriate)
-	- use full instead of short classnames in relationships (from victori)
+        - fix for rt.cpan.org #22425 (use File::Spec where appropriate)
+        - use full instead of short classnames in relationships (from victori)
 
 0.03008 Fri Oct 20 18:08:20 UTC 2006
         - fix for rt.cpan.org #21084 (dump_overwrite pathological output recursion)
@@ -111,7 +118,7 @@
 
 0.02007 Wed Mar 22 06:03:53 UTC 2006
         - Backported Class::C3::reinitialize changes from -refactor
-	  branch, resulting in significantly reduced load time
+          branch, resulting in significantly reduced load time
 
 0.02006 Fri Mar 17 04:55:55 UTC 2006
         - Fix long-standing table/col-name case bugs
@@ -138,8 +145,8 @@
 
 0.02005 Mon Feb 27 23:53:17 UTC 2006
         - Move the external file loading to after everything else
-	  loader does, in case people want to define, override, or
-	  build on top of the rels.
+          loader does, in case people want to define, override, or
+          build on top of the rels.
 
 0.02004 Mon Feb 27 23:53:17 UTC 2006
         - Minor fix to debugging message for loading external files

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	2007-03-29 13:42:27 UTC (rev 3148)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm	2007-03-29 13:44:16 UTC (rev 3149)
@@ -27,6 +27,22 @@
 
 =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;
+}
+
 sub _table_fk_info {
     my ($self, $table) = @_;
 

Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI.pm	2007-03-29 13:42:27 UTC (rev 3148)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI.pm	2007-03-29 13:44:16 UTC (rev 3149)
@@ -107,7 +107,7 @@
         $table = $self->{db_schema} . $self->{_namesep} . $table;
     }
 
-    my $sth = $dbh->prepare("SELECT * FROM $table WHERE 1=0");
+    my $sth = $dbh->prepare($self->schema->storage->sql_maker->select($table, undef, \'1 = 0'));
     $sth->execute;
     return \@{$sth->{NAME_lc}};
 }

Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader.pm
===================================================================