remove unnecessary test Result class

[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 d58114d..68ce2c1 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Sybase.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase.pm
@@ -12,7 +12,7 @@ use Carp::Clan qw/^DBIx::Class/;
 
 =head1 NAME
 
-DBIx::Class::Storage::DBI::Sybase - Storage::DBI subclass for Sybase
+DBIx::Class::Storage::DBI::Sybase - Sybase support for DBIx::Class
 
 =head1 SYNOPSIS
 
@@ -31,12 +31,13 @@ without doing a C<select max(col)>.
 
 But your queries will be cached.
 
-You need at least version C<1.09> of L<DBD::Sybase> for placeholder support.
-Otherwise your storage will be automatically reblessed into C<::NoBindVars>.
+You need a version of L<DBD::Sybase> compiled with the Sybase OpenClient
+libraries, B<NOT> FreeTDS, for placeholder support. Otherwise your storage will
+be automatically reblessed into C<::NoBindVars>.
 
-A recommended L<DBIx::Class::Storage::DBI/connect_info> settings:
+A recommended L<DBIx::Class::Storage::DBI/connect_info> setting:
 
-  on_connect_call => [['datetime_setup'], [blob_setup => log_on_update => 0]]
+  on_connect_call => [['datetime_setup'], ['blob_setup', log_on_update => 0]]
 
 =head1 METHODS
 
@@ -64,20 +65,16 @@ sub _rebless {
     } else { # real Sybase
       my $no_bind_vars = 'DBIx::Class::Storage::DBI::Sybase::NoBindVars';
 
-      if (not $self->dbh->{syb_dynamic_supported}) {
-        $self->ensure_class_loaded($no_bind_vars);
-        bless $self, $no_bind_vars;
-        $self->_rebless;
-      }
-      
-      if ($DBD::Sybase::VERSION < 1.09) {
+      if ($self->_using_freetds) {
         carp <<'EOF';
 
 Your version of Sybase potentially supports placeholders and query caching,
-however your version of DBD::Sybase is too old to do this properly. Please
-upgrade to at least version 1.09 if you want this feature.
+however you seem to be using FreeTDS which does not (yet?) support this.
+
+Please recompile DBD::Sybase with the Sybase OpenClient libraries if you want
+these features.
 
-TEXT/IMAGE column support will also not work in older versions of DBD::Sybase.
+TEXT/IMAGE column support will also not work under FreeTDS.
 
 See perldoc DBIx::Class::Storage::DBI::Sybase for more details.
 EOF
@@ -85,11 +82,24 @@ EOF
         bless $self, $no_bind_vars;
         $self->_rebless;
       }
+
+      if (not $self->dbh->{syb_dynamic_supported}) {
+        $self->ensure_class_loaded($no_bind_vars);
+        bless $self, $no_bind_vars;
+        $self->_rebless;
+      }
+ 
       $self->_set_maxConnect;
     }
   }
 }
 
+sub _using_freetds {
+  my $self = shift;
+
+  return $self->_dbh->{syb_oc_version} =~ /freetds/i;
+}
+
 sub _set_maxConnect {
   my $self = shift;
 
@@ -109,7 +119,7 @@ sub _set_maxConnect {
 
 Used as:
 
-  on_connect_call => [ [ blob_setup => log_on_update => 0 ] ]
+  on_connect_call => [ [ 'blob_setup', log_on_update => 0 ] ]
 
 Does C<< $dbh->{syb_binary_images} = 1; >> to return C<IMAGE> data as raw binary
 instead of as a hex string.
@@ -144,11 +154,11 @@ sub _is_lob_type {
 ## need to use the API, but for now it isn't.
 #
 #sub order_columns_for_select {
-#  my ($self, $source) = @_;
+#  my ($self, $source, $columns) = @_;
 #
 #  my (@non_blobs, @blobs);
 #
-#  for my $col ($source->columns) {
+#  for my $col (@$columns) {
 #    if ($self->_is_lob_type($source->column_info($col)->{data_type})) {
 #      push @blobs, $col;
 #    } else {
@@ -385,8 +395,8 @@ for L<DBIx::Class::InflateColumn::DateTime>.
 
 =head1 IMAGE AND TEXT COLUMNS
 
-You need at least version C<1.09> of L<DBD::Sybase> for C<TEXT/IMAGE> column
-support.
+L<DBD::Sybase> compiled with FreeTDS will B<NOT> work with C<TEXT/IMAGE>
+columns.
 
 See L</connect_call_blob_setup> for a L<DBIx::Class::Storage::DBI/connect_info>
 setting you need to work with C<IMAGE> columns.