Merge 'trunk' into 'current'

r30561@brandon-blacks-computer (orig r3197):  blblack | 2007-04-16 21:29:51 -0500
fix for ^sqlite_ tables from chromatic

diff --git a/Changes b/Changes
index 7b5af22..f3ff24a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 Revision history for Perl extension DBIx::Class::Schema::Loader
 
+        - skip ^sqlite_ tables in SQLite (thanks chromatic)
+
 0.03999_01 Sat Apr 14 19:57:40 GMT 2007
         - Added *experimental* Oracle support from work done
           by Tsunoda Kazuya some months ago.  Not well tested.

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm b/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
index a26a467..807af5e 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
@@ -167,6 +167,7 @@ sub _tables_list {
     my @tables;
     while ( my $row = $sth->fetchrow_hashref ) {
         next unless lc( $row->{type} ) eq 'table';
+        next if $row->{tbl_name} =~ /^sqlite_/;
         push @tables, $row->{tbl_name};
     }
     $sth->finish;