(maint) Simplify SqlConnection error handling

 - The existing SqlConnection class has a public property
   exception_caught, which is not used.  Further, it uses this value
   to save off exceptions inside the class, rather than simply
   returning the parsed errors when open_and_run_command is executed,
   which is presently the only caller that ever looks at the
   error values.

   This provides an opportunity to simplify the code paths, and remove
   unnecessary caching of errors and the 2 unnecessary methods
   has_errors and error_message from the SqlConnection class.

   Instead, directly return a new ResultOutput instance as soon as
   SQL code is executed.

   Tests are modified accordingly.

Author: Iristyle

lib/puppet_x/sqlserver/sql_connection.rb

@@ -4,20 +4,17 @@ module Sqlserver
     CONNECTION_CLOSED = 0
 
     class SqlConnection
-      attr_reader :exception_caught
-
       def open_and_run_command(query, config)
         begin
           open(config)
-          reset_instance
           execute(query)
         rescue win32_exception => e
-          @exception_caught = e
+          return ResultOutput.new(true, e.message)
         ensure
           close
         end
 
-        ResultOutput.new(has_errors, error_message)
+        ResultOutput.new(false, nil)
       end
 
       private
@@ -46,25 +43,13 @@ def get_connection_string(config)
         params.map { |k, v| "#{k}=#{v}" }.join(';')
       end
 
-      def has_errors
-        @exception_caught != nil
-      end
-
-      def error_message
-        @exception_caught.message unless @exception_caught == nil
-      end
-
       def close
         begin
           connection.Close unless connection_closed?
         rescue win32_exception => e
         end
       end
 
-      def reset_instance
-        @exception_caught = nil
-      end
-
       def connection_closed?
         connection.State == CONNECTION_CLOSED
       end

spec/unit/puppet_x/sql_connection_spec.rb

@@ -13,19 +13,13 @@ def stub_connection
     subject.stubs(:win32_exception).returns(Exception)
   end
 
-  def stub_no_errors
-    subject.stubs(:has_errors).returns(false)
-    subject.stubs(:error_message).returns(nil)
-  end
-
   describe 'open_and_run_command' do
     context 'command execution' do
       before :each do
         stub_connection
         @connection.stubs(:Open).with('Provider=SQLOLEDB.1;User ID=sa;Password=Pupp3t1@;Initial Catalog=master;Application Name=Puppet;Data Source=localhost')
       end
       it 'should not raise an error but populate has_errors with message' do
-        subject.stubs(:win32_exception).returns(Exception)
         subject.stubs(:execute).raises(Exception.new("SQL Server\n error has happened"))
         expect {
           result = subject.open_and_run_command('whacka whacka whacka', config)
@@ -44,7 +38,7 @@ def stub_no_errors
     context 'closed connection' do
       before :each do
         stub_connection
-        stub_no_errors
+        @connection.stubs(:Execute)
       end
       it 'should not add MSSQLSERVER to connection string' do
         @connection.stubs(:Open).with('Provider=SQLOLEDB.1;User ID=sa;Password=Pupp3t1@;Initial Catalog=master;Application Name=Puppet;Data Source=localhost')
@@ -66,13 +60,10 @@ def stub_no_errors
     end
     context 'return result with errors' do
       it {
+        subject.stubs(:win32_exception).returns(Exception)
         subject.expects(:open).with({:admin_user => 'sa', :admin_pass => 'Pupp3t1@', :instance_name => 'MSSQLSERVER'})
-        subject.expects(:execute).with('SELECT * FROM sys.databases')
+        subject.expects(:execute).with('SELECT * FROM sys.databases').raises(Exception.new("SQL Server\ninvalid syntax provider"))
         subject.expects(:close).once
-        subject.stubs(:has_errors).returns(:true)
-        subject.stubs(:error_message).returns(
-          'SQL Server
-    invalid syntax provider')
         result =
           subject.open_and_run_command('SELECT * FROM sys.databases', config)
         expect(result.exitstatus).to eq(1)
@@ -84,8 +75,6 @@ def stub_no_errors
         stub_connection
         err_message = "SQL Server\n ConnectionFailed"
         @connection.stubs(:Open).raises(Exception.new(err_message))
-        subject.stubs(:has_errors).returns(true)
-        subject.stubs(:error_message).returns(err_message)
         expect {
           result = subject.open_and_run_command('whacka whacka whacka', config)
           expect(result.exitstatus).to eq(1)