From: Brandon Black <blblack@gmail.com>
Date: Tue, 17 Apr 2007 02:30:49 +0000 (+0000)
Subject: Merge 'trunk' into 'current'
X-Git-Tag: 0.03999_02~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e0510424237e567ad9fab64f21df01b3dff0e320;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

Merge 'trunk' into 'current'

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

e0510424237e567ad9fab64f21df01b3dff0e320
diff --cc Changes
index 7b5af22,c414049..f3ff24a
--- a/Changes
+++ b/Changes
@@@ -1,21 -1,7 +1,23 @@@
  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.
 +        - Added "rescan" schema (and loader) method, which picks
 +          up newly created tables at runtime
 +        - Made dump_to_dir / dump_overwrite much more intelligent
 +          (they now preserve customizations by default)
 +        - Added support for DBI's new standard "statistics_info"
 +          method to gather unique key info (only supported by
 +          DBD::Pg trunk afaik)
 +        - columns_info_for imported from DBIx::Class
 +        - relationships are now on by default, use skip_relationships
 +          to disable them
 +        - Removed previously deprecated methods/options
 +        - Added $VERSION to all packages in this dist
 +
  0.03011 Sat Apr 14 19:03:07 UTC 2007
          - fix case-sensitivity in UNIQUE parsing for SQLite
  
diff --cc lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
index a26a467,51530b4..807af5e
--- a/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
@@@ -167,9 -147,9 +167,10 @@@ 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;
      return @tables;
  }