better _tables_list for MSSQL

diff --git a/Changes b/Changes
index a93df57..b6e72c7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 Revision history for Perl extension DBIx::Class::Schema::Loader
 
+        - better _tables_list for MSSQL
         - pick up views in SQLite too
         - better rel inflection using Lingua::EN::Inflect::Phrase
         - cascade_delete and cascade_copy are turned off for has_many/might_have

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
index a0a1785..bfc2053 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
@@ -12,20 +12,34 @@ our $VERSION = '0.05003';
 
 DBIx::Class::Schema::Loader::DBI::MSSQL - DBIx::Class::Schema::Loader::DBI MSSQL Implementation.
 
-=head1 SYNOPSIS
+=head1 DESCRIPTION
 
-  package My::Schema;
-  use base qw/DBIx::Class::Schema::Loader/;
+Base driver for Microsoft SQL Server, used by
+L<DBIx::Class::Schema::Loader::DBI::Sybase::Microsoft_SQL_Server> for support
+via L<DBD::Sybase> and
+L<DBIx::Class::Schema::Loader::DBI::ODBC::Microsoft_SQL_Server> for support via
+L<DBD::ODBC>.
 
-  __PACKAGE__->loader_options( debug => 1 );
+See L<DBIx::Class::Schema::Loader> and L<DBIx::Class::Schema::Loader::Base> for
+usage information.
 
-  1;
+=cut
 
-=head1 DESCRIPTION
+sub _tables_list {
+    my $self = shift;
 
-See L<DBIx::Class::Schema::Loader::Base>.
+    my $dbh = $self->schema->storage->dbh;
+    my $sth = $dbh->prepare(<<'EOF');
+select t.table_name
+from information_schema.tables t
+where t.table_schema = ?
+EOF
+    $sth->execute($self->db_schema);
 
-=cut
+    my @tables = map lc $_, map @$_, @{ $sth->fetchall_arrayref };
+
+    return $self->_filter_tables(@tables);
+}
 
 sub _table_pk_info {
     my ($self, $table) = @_;
@@ -130,6 +144,8 @@ sub _extra_column_info {
 
 =head1 SEE ALSO
 
+L<DBIx::Class::Schema::Loader::DBI::Sybase::Microsoft_SQL_Server>,
+L<DBIx::Class::Schema::Loader::DBI::ODBC::Microsoft_SQL_Server>,
 L<DBIx::Class::Schema::Loader>, L<DBIx::Class::Schema::Loader::Base>,
 L<DBIx::Class::Schema::Loader::DBI>
 

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm b/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm
index 30ffbc4..1aa59a0 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm
@@ -10,33 +10,20 @@ our $VERSION = '0.05003';
 
 =head1 NAME
 
-DBIx::Class::Schema::Loader::DBI::Sybase::Microsoft_SQL_Server - Subclass for
-using MSSQL through DBD::Sybase
+DBIx::Class::Schema::Loader::DBI::Sybase::Microsoft_SQL_Server - Driver for
+using Microsoft SQL Server through DBD::Sybase
 
 =head1 DESCRIPTION
 
-See L<DBIx::Class::Schema::Loader::Base>.
-
 Subclasses L<DBIx::Class::Schema::Loader::DBI::MSSQL>.
 
-=cut
-
-# Returns an array of table names
-sub _tables_list { 
-    my $self = shift;
-
-    my ($table, $type) = @_ ? @_ : ('%', '%');
-
-    my $dbh = $self->schema->storage->dbh;
-    my @tables = $dbh->tables(undef, $self->db_schema, $table, $type);
-
-    return $self->_filter_tables(@tables);
-}
+See L<DBIx::Class::Schema::Loader> and L<DBIx::Class::Schema::Loader::Base>.
 
 =head1 SEE ALSO
 
-L<DBIx::Class::Schema::Loader::DBI::Sybase>,
 L<DBIx::Class::Schema::Loader::DBI::MSSQL>,
+L<DBIx::Class::Schema::Loader::DBI::ODBC::Microsoft_SQL_Server>,
+L<DBIx::Class::Schema::Loader::DBI::Sybase::Common>,
 L<DBIx::Class::Schema::Loader::DBI>
 L<DBIx::Class::Schema::Loader>, L<DBIx::Class::Schema::Loader::Base>,
 

diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm
index 155a12a..44fbea3 100644 (file)
--- a/t/lib/dbixcsl_common_tests.pm
+++ b/t/lib/dbixcsl_common_tests.pm
@@ -148,7 +148,7 @@ sub setup_schema {
          };
  
         ok(!$@, "Loader initialization") or diag $@;
- 
+
         find sub { return if -d; $file_count++ }, $DUMP_DIR;
  
         $expected_count += grep /CREATE (?:TABLE|VIEW)/i,