Cleaner assertion envvar handling

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI / Sybase.pm

diff --git a/lib/DBIx/Class/Storage/DBI/Sybase.pm b/lib/DBIx/Class/Storage/DBI/Sybase.pm
index 32f7996..6288325 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Sybase.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase.pm
@@ -21,28 +21,25 @@ L<DBD::Sybase>
 
 =cut
 
-sub _rebless {
+sub _rebless { shift->_determine_connector_driver('Sybase') }
+
+sub _get_rdbms_name {
   my $self = shift;
 
-  my $dbtype;
   try {
-    $dbtype = @{$self->_get_dbh->selectrow_arrayref(qq{sp_server_info \@attribute_id=1})}[2]
-  } catch {
-    $self->throw_exception("Unable to estable connection to determine database type: $_")
-  };
-
-  if ($dbtype) {
-    $dbtype =~ s/\W/_/gi;
+    my $name = $self->_get_dbh->selectrow_arrayref('sp_server_info @attribute_id=1')->[2];
 
-    # saner class name
-    $dbtype = 'ASE' if $dbtype eq 'SQL_Server';
+    if ($name) {
+      $name =~ s/\W/_/gi;
 
-    my $subclass = __PACKAGE__ . "::$dbtype";
-    if ($self->load_optional_class($subclass)) {
-      bless $self, $subclass;
-      $self->_rebless;
+      # saner class name
+      $name = 'ASE' if $name eq 'SQL_Server';
     }
-  }
+
+    $name;  # RV
+  } catch {
+    $self->throw_exception("Unable to establish connection to determine database type: $_")
+  };
 }
 
 sub _init {
@@ -83,8 +80,7 @@ sub _ping {
 
   if ($dbh->{syb_no_child_con}) {
     return try {
-      $self->_connect(@{$self->_dbi_connect_info || [] })
-        ->do('select 1');
+      $self->_connect->do('select 1');
       1;
     }
     catch {
@@ -132,14 +128,18 @@ sub _using_freetds_version {
   return $inf =~ /v([0-9\.]+)/ ? $1 : 0;
 }
 
-1;
-
-=head1 AUTHORS
+=head1 FURTHER QUESTIONS?
 
-See L<DBIx::Class/CONTRIBUTORS>.
+Check the list of L<additional DBIC resources|DBIx::Class/GETTING HELP/SUPPORT>.
 
-=head1 LICENSE
+=head1 COPYRIGHT AND LICENSE
 
-You may distribute this code under the same terms as Perl itself.
+This module is free software L<copyright|DBIx::Class/COPYRIGHT AND LICENSE>
+by the L<DBIx::Class (DBIC) authors|DBIx::Class/AUTHORS>. You can
+redistribute it and/or modify it under the same terms as the
+L<DBIx::Class library|DBIx::Class/COPYRIGHT AND LICENSE>.
 
 =cut
+
+1;
+