Introduce GOVERNANCE document and empty RESOLUTIONS file.

[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 02464e4..a714268 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Sybase.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase.pm
@@ -2,7 +2,7 @@ package DBIx::Class::Storage::DBI::Sybase;
 
 use strict;
 use warnings;
-use Try::Tiny;
+use DBIx::Class::_Util qw( dbic_internal_try dbic_internal_catch );
 use namespace::clean;
 
 use base qw/DBIx::Class::Storage::DBI/;
@@ -21,28 +21,26 @@ L<DBD::Sybase>
 
 =cut
 
-sub _rebless {
-  my $self = shift;
+sub _rebless { shift->_determine_connector_driver('Sybase') }
 
-  my $dbtype;
-  try {
-    $dbtype = @{$self->_get_dbh->selectrow_arrayref(qq{sp_server_info \@attribute_id=1})}[2]
-  } catch {
-    $self->throw_exception("Unable to establish connection to determine database type: $_")
-  };
+sub _get_rdbms_name {
+  my $self = shift;
 
-  if ($dbtype) {
-    $dbtype =~ s/\W/_/gi;
+  dbic_internal_try {
+    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
   }
+  dbic_internal_catch {
+    $self->throw_exception("Unable to establish connection to determine database type: $_")
+  };
 }
 
 sub _init {
@@ -78,27 +76,10 @@ sub _ping {
   local $dbh->{RaiseError} = 1;
   local $dbh->{PrintError} = 0;
 
-# FIXME if the main connection goes stale, does opening another for this statement
-# really determine anything?
-
-  if ($dbh->{syb_no_child_con}) {
-    return try {
-      $self->_connect(@{$self->_dbi_connect_info || [] })
-        ->do('select 1');
-      1;
-    }
-    catch {
-      0;
-    };
-  }
-
-  return try {
-    $dbh->do('select 1');
-    1;
-  }
-  catch {
-    0;
-  };
+  ( dbic_internal_try { $dbh->do('select 1'); 1 } )
+    ? 1
+    : 0
+  ;
 }
 
 sub _set_max_connect {
@@ -132,14 +113,18 @@ sub _using_freetds_version {
   return $inf =~ /v([0-9\.]+)/ ? $1 : 0;
 }
 
-1;
+=head1 FURTHER QUESTIONS?
 
-=head1 AUTHORS
+Check the list of L<additional DBIC resources|DBIx::Class/GETTING HELP/SUPPORT>.
 
-See L<DBIx::Class/CONTRIBUTORS>.
+=head1 COPYRIGHT AND LICENSE
 
-=head1 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;
+