X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=f052bb7b47f21ab33e03a2e6186b26ddebf23614;hb=e4be49c99edfa51b5dee57848ab589fa9bff38a2;hp=031e07476ad1a9dbccf386778825882fbf042c9c;hpb=7f811614b046050559eee2b5318cc30bf00b8729;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI.pm b/lib/DBIx/Class/Schema/Loader/DBI.pm
index 031e074..f052bb7 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI.pm
@@ -108,7 +108,7 @@ sub _tables_list {
     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;
     }
@@ -167,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 {
@@ -378,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;
@@ -390,13 +393,7 @@ sub _columns_info_for {
         my $type_num = $colinfo->{data_type};
         my $type_name;
         if (defined $type_num && $type_num =~ /^-?\d+\z/ && $dbh->can('type_info')) {
-            my $type_info = do {
-                # for buggy Firebird ODBC driver
-                local $dbh->{LongReadLen} = 100_000;
-                local $dbh->{LongTruncOk} = 1;
-                $dbh->type_info($type_num);
-            };
-            $type_name = $type_info->{TYPE_NAME} if $type_info;
+            my $type_name = $self->_dbh_type_info_type_name($type_num);
             $colinfo->{data_type} = lc $type_name if $type_name;
         }
     }
@@ -404,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 {}