more work on multi-db_schema

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

diff --git a/lib/DBIx/Class/Schema/Loader/DBI.pm b/lib/DBIx/Class/Schema/Loader/DBI.pm
index 76e741b..dce5f27 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/DBI.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI.pm
@@ -8,7 +8,7 @@ use Carp::Clan qw/^DBIx::Class/;
 use Try::Tiny;
 use namespace::clean;
 
-our $VERSION = '0.07007';
+our $VERSION = '0.07010';
 
 __PACKAGE__->mk_group_accessors('simple', qw/
     _disable_pk_detection
@@ -101,14 +101,14 @@ sub _tables_list {
     my ($table, $type) = @_ ? @_ : ('%', '%');
 
     my $dbh = $self->schema->storage->dbh;
-    my @tables = $dbh->tables(undef, $self->db_schema, $table, $type);
+    my @tables = $dbh->tables(undef, $table->schema, $table, $type);
 
     my $qt = qr/[\Q$self->{_quoter}\E"'`\[\]]/;
 
     my $all_tables_quoted = (grep /$qt/, @tables) == @tables;
 
     if ($self->{_quoter} && $all_tables_quoted) {
-        s/.* $qt (?= .* $qt)//xg for @tables;
+        s/.* $qt (?= .* $qt\z)//xg for @tables;
     } else {
         s/^.*\Q$self->{_namesep}\E// for @tables;
     }
@@ -133,6 +133,7 @@ sub _filter_tables {
 
     LOOP: for my $table (@tables) {
         try {
+            local $^W = 0; # for ADO
             my $sth = $self->_sth_for($table, undef, \'1 = 0');
             $sth->execute;
         }
@@ -166,14 +167,17 @@ sub load {
 sub _table_as_sql {
     my ($self, $table) = @_;
 
-    if($self->{db_schema}) {
-        $table = $self->{db_schema} . $self->{_namesep} .
-            $self->_quote_table_name($table);
-    } else {
-        $table = $self->_quote_table_name($table);
+    my $sql_maker = $self->schema->storage->sql_maker;
+    my $name_sep  = $sql_maker->name_sep;
+    my $schema    = $table->schema;
+
+    if ($schema) {
+        return $self->_quote($schema)
+            . $name_sep
+            . $self->_quote($table);
     }
 
-    return $table;
+    return $self->_quote($table);
 }
 
 sub _sth_for {
@@ -208,7 +212,7 @@ sub _table_pk_info {
     my $dbh = $self->schema->storage->dbh;
 
     my @primary = try {
-        $dbh->primary_key('', $self->db_schema, $table);
+        $dbh->primary_key('', $table->schema, $table);
     }
     catch {
         warn "Cannot find primary keys for this driver: $_";
@@ -239,7 +243,7 @@ sub _table_uniq_info {
     }
 
     my %indices;
-    my $sth = $dbh->statistics_info(undef, $self->db_schema, $table, 1, 1);
+    my $sth = $dbh->statistics_info(undef, $table->schema, $table, 1, 1);
     while(my $row = $sth->fetchrow_hashref) {
         # skip table-level stats, conditional indexes, and any index missing
         #  critical fields
@@ -270,8 +274,8 @@ sub _table_fk_info {
 
     my $dbh = $self->schema->storage->dbh;
     my $sth = try {
-        $dbh->foreign_key_info( '', $self->db_schema, '',
-                                '', $self->db_schema, $table );
+        $dbh->foreign_key_info( '', $table->schema, '',
+                                '', $table->schema, $table );
     }
     catch {
         warn "Cannot introspect relationships for this driver: $_";
@@ -319,7 +323,7 @@ sub _columns_info_for {
     my %result;
 
     if ($dbh->can('column_info')) {
-        my $sth = $self->_dbh_column_info($dbh, undef, $self->db_schema, $table, '%' );
+        my $sth = $self->_dbh_column_info($dbh, undef, $table->schema, $table, '%' );
         while ( my $info = $sth->fetchrow_hashref() ){
             my $column_info = {};
             $column_info->{data_type}     = lc $info->{TYPE_NAME};
@@ -377,7 +381,7 @@ sub _columns_info_for {
             $column_info->{size}    = $2;
         }
 
-        my $extra_info = $self->_extra_column_info($table, $columns[$i], $column_info) || {};
+        my $extra_info = $self->_extra_column_info($table, $columns[$i], $column_info, $sth) || {};
         $column_info = { %$column_info, %$extra_info };
 
         $result{ $self->_lc($columns[$i]) } = $column_info;
@@ -388,9 +392,8 @@ sub _columns_info_for {
         my $colinfo = $result{$col};
         my $type_num = $colinfo->{data_type};
         my $type_name;
-        if (defined $type_num && $type_num =~ /^\d+\z/ && $dbh->can('type_info')) {
-            my $type_info = $dbh->type_info($type_num);
-            $type_name = $type_info->{TYPE_NAME} if $type_info;
+        if (defined $type_num && $type_num =~ /^-?\d+\z/ && $dbh->can('type_info')) {
+            my $type_name = $self->_dbh_type_info_type_name($type_num);
             $colinfo->{data_type} = lc $type_name if $type_name;
         }
     }
@@ -398,6 +401,17 @@ sub _columns_info_for {
     return \%result;
 }
 
+# Need to override this for the buggy Firebird ODBC driver.
+sub _dbh_type_info_type_name {
+    my ($self, $type_num) = @_;
+
+    my $dbh = $self->schema->storage->dbh;
+
+    my $type_info = $dbh->type_info($type_num);
+    
+    return $type_info ? $type_info->{TYPE_NAME} : undef;
+}
+
 # do not use this, override _columns_info_for instead
 sub _extra_column_info {}