From 52b78fd7e6299dcd9c2c6a1c56764e7fc480afd1 Mon Sep 17 00:00:00 2001
From: garnier-quentin <garnier.quentin@gmail.com>
Date: Thu, 20 Dec 2018 12:03:50 +0100
Subject: [PATCH] + Fix mssql version bug

---
 centreon-plugins/centreon/plugins/dbi.pm | 7 ++++++-
 centreon-plugins/database/mssql/dbi.pm   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/centreon-plugins/centreon/plugins/dbi.pm b/centreon-plugins/centreon/plugins/dbi.pm
index 05d0cdb7f..560df8a1e 100644
--- a/centreon-plugins/centreon/plugins/dbi.pm
+++ b/centreon-plugins/centreon/plugins/dbi.pm
@@ -262,18 +262,23 @@ sub fetchrow_hashref {
 
 sub query {
     my ($self, %options) = @_;
+    my $continue_error = defined($options{continue_error}) && $options{continue_error} == 1 ? 1 : 0;
     
     $self->{statement_handle} = $self->{instance}->prepare($options{query});
     if (!defined($self->{statement_handle})) {
+        return 1 if ($continue_error == 1);
         $self->{output}->add_option_msg(short_msg => "Cannot execute query: " . $self->{instance}->errstr);
         $self->{output}->option_exit(exit_litteral => $self->{sql_errors_exit});
     }
 
     my $rv = $self->{statement_handle}->execute;
     if (!$rv) {
+        return 1 if ($continue_error == 1);
         $self->{output}->add_option_msg(short_msg => "Cannot execute query: " . $self->{statement_handle}->errstr);
         $self->{output}->option_exit(exit_litteral => $self->{sql_errors_exit});
-    }    
+    }
+    
+    return 0;
 }
 
 1;
diff --git a/centreon-plugins/database/mssql/dbi.pm b/centreon-plugins/database/mssql/dbi.pm
index bb5258413..6d70d3231 100644
--- a/centreon-plugins/database/mssql/dbi.pm
+++ b/centreon-plugins/database/mssql/dbi.pm
@@ -31,7 +31,7 @@ sub set_version {
     $self->{version} = $self->{instance}->get_info(18); # SQL_DBMS_VER
     return if (defined($self->{version}) && $self->{version} ne '');
     
-    $self->query(query => q{select SERVERPROPERTY('productversion') as product_version});
+    return if ($self->query(query => q{select SERVERPROPERTY('productversion') as product_version}, continue_error => 1) == 1);
     my $row = $self->fetchrow_hashref();
     $self->{version} = $row->{product_version};
 }