multi db_schema support

[dbsrgits/DBIx-Class-Schema-Loader.git] / lib / DBIx / Class / Schema / Loader / DBI / Pg.pm

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
index 6901280..c16231a 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
@@ -6,7 +6,6 @@ use base qw/
     DBIx::Class::Schema::Loader::DBI::Component::QuotedDefault
     DBIx::Class::Schema::Loader::DBI
 /;
-use Carp::Clan qw/^DBIx::Class/;
 use mro 'c3';
 
 our $VERSION = '0.07010';
@@ -16,18 +15,9 @@ our $VERSION = '0.07010';
 DBIx::Class::Schema::Loader::DBI::Pg - DBIx::Class::Schema::Loader::DBI
 PostgreSQL Implementation.
 
-=head1 SYNOPSIS
-
-  package My::Schema;
-  use base qw/DBIx::Class::Schema::Loader/;
-
-  __PACKAGE__->loader_options( debug => 1 );
-
-  1;
-
 =head1 DESCRIPTION
 
-See L<DBIx::Class::Schema::Loader::Base>.
+See L<DBIx::Class::Schema::Loader> and L<DBIx::Class::Schema::Loader::Base>.
 
 =cut
 
@@ -36,7 +26,7 @@ sub _setup {
 
     $self->next::method(@_);
 
-    $self->{db_schema} ||= 'public';
+    $self->{db_schema} ||= ['public'];
 
     if (not defined $self->preserve_case) {
         $self->preserve_case(0);
@@ -47,24 +37,10 @@ sub _setup {
     }
 }
 
-sub _tables_list {
-    my ($self, $opts) = @_;
-
-    my $dbh = $self->schema->storage->dbh;
-    my @tables = $dbh->tables(undef, $self->db_schema, '%', '%');
-
-    my $schema_quoted = $tables[0] =~ /^"/;
-
-    if ($schema_quoted) {
-        s/^"[^"]+"\.// for @tables;
-    }
-    else {
-        s/^[^.]+\.// for @tables;
-    }
-
-    s/^"([^"]+)"\z/$1/ for @tables;
+sub _system_schemas {
+    my $self = shift;
 
-    return $self->_filter_tables(\@tables, $opts);
+    return ($self->next::method(@_), 'pg_catalog');
 }
 
 sub _table_uniq_info {
@@ -75,18 +51,17 @@ sub _table_uniq_info {
         if $DBD::Pg::VERSION >= 1.50;
 
     my @uniqs;
-    my $dbh = $self->schema->storage->dbh;
 
     # Most of the SQL here is mostly based on
     #   Rose::DB::Object::Metadata::Auto::Pg, after some prodding from
     #   John Siracusa to use his superior SQL code :)
 
-    my $attr_sth = $self->{_cache}->{pg_attr_sth} ||= $dbh->prepare(
+    my $attr_sth = $self->{_cache}->{pg_attr_sth} ||= $self->dbh->prepare(
         q{SELECT attname FROM pg_catalog.pg_attribute
         WHERE attrelid = ? AND attnum = ?}
     );
 
-    my $uniq_sth = $self->{_cache}->{pg_uniq_sth} ||= $dbh->prepare(
+    my $uniq_sth = $self->{_cache}->{pg_uniq_sth} ||= $self->dbh->prepare(
         q{SELECT x.indrelid, i.relname, x.indkey
         FROM
           pg_catalog.pg_index x
@@ -103,7 +78,7 @@ sub _table_uniq_info {
           c.relname     = ?}
     );
 
-    $uniq_sth->execute($self->db_schema, $table);
+    $uniq_sth->execute($table->schema, $table);
     while(my $row = $uniq_sth->fetchrow_arrayref) {
         my ($tableid, $indexname, $col_nums) = @$row;
         $col_nums =~ s/^\s+//;
@@ -128,37 +103,38 @@ sub _table_uniq_info {
 }
 
 sub _table_comment {
-    my ( $self, $table ) = @_;
-    my ($table_comment) = $self->next::method($table);
-    if (not $table_comment) {
-        ($table_comment) = $self->schema->storage->dbh->selectrow_array(
-            q{SELECT obj_description(oid) 
-                FROM pg_class 
-                WHERE relname=? AND relnamespace=(
-                    SELECT oid FROM pg_namespace WHERE nspname=?)
-            }, undef, $table, $self->db_schema
-            );   
-    }
+    my $self = shift;
+    my ($table) = @_;
+
+    my $table_comment = $self->next::method(@_);
+
+    return $table_comment if $table_comment;
+
+    ($table_comment) = $self->dbh->selectrow_array(<<'EOF', {}, $table->name, $table->schema);
+SELECT obj_description(oid) 
+FROM pg_class 
+WHERE relname=? AND relnamespace=(SELECT oid FROM pg_namespace WHERE nspname=?)
+EOF
+
     return $table_comment
 }
 
 
 sub _column_comment {
-    my ( $self, $table, $column_number, $column_name ) = @_;
-    my ($column_comment) = $self->next::method(
-        $table, $column_number, $column_name);
-    if (not $column_comment) {
-        my ($table_oid) = $self->schema->storage->dbh->selectrow_array(
-            q{SELECT oid
-                FROM pg_class 
-                WHERE relname=? AND relnamespace=(
-                    SELECT oid FROM pg_namespace WHERE nspname=?)
-            }, undef, $table, $self->db_schema
-            );   
-        $column_comment = $self->schema->storage->dbh->selectrow_array(
-            'SELECT col_description(?,?)', undef, $table_oid, $column_number );
-    }
-    return $column_comment;
+    my $self = shift;
+    my ($table, $column_number, $column_name) = @_;
+
+    my $column_comment = $self->next::method(@_);
+
+    return $column_comment if $column_comment;
+
+    my ($table_oid) = $self->dbh->selectrow_array(<<'EOF', {}, $table->name, $table->schema);
+SELECT oid
+FROM pg_class 
+WHERE relname=? AND relnamespace=(SELECT oid FROM pg_namespace WHERE nspname=?)
+EOF
+
+    return $self->dbh->selectrow_array('SELECT col_description(?,?)', {}, $table_oid, $column_number);
 }
 
 # Make sure data_type's that don't need it don't have a 'size' column_info, and
@@ -199,7 +175,7 @@ EOF
                     delete $info->{size};
                 }
                 else {
-                    my ($integer_datetimes) = $self->schema->storage->dbh
+                    my ($integer_datetimes) = $self->dbh
                         ->selectrow_array('show integer_datetimes');
 
                     my $max_precision =
@@ -223,8 +199,7 @@ EOF
         elsif ($data_type =~ /^(?:bit(?: varying)?|varbit)\z/i) {
             $info->{data_type} = 'varbit' if $data_type =~ /var/i;
 
-            my ($precision) = $self->schema->storage->dbh
-                ->selectrow_array(<<EOF, {}, $table, $col);
+            my ($precision) = $self->dbh->selectrow_array(<<EOF, {}, $table, $col);
 SELECT character_maximum_length
 FROM information_schema.columns
 WHERE table_name = ? and column_name = ?
@@ -259,10 +234,10 @@ SELECT typtype
 FROM pg_catalog.pg_type
 WHERE typname = ?
 EOF
-            if ($typetype eq 'e') {
+            if ($typetype && $typetype eq 'e') {
                 # The following will extract a list of allowed values for the
                 # enum.
-                my $typevalues = $self->schema->storage->dbh
+                my $typevalues = $self->dbh
                     ->selectall_arrayref(<<EOF, {}, $info->{data_type});
 SELECT e.enumlabel
 FROM pg_catalog.pg_enum e