Merge pull request #41 from Sage/connection-pool-full-error-handling

Empty connection pool error handling

lib/mysql_framework/connector.rb

@@ -77,7 +77,7 @@ def with_client(provided = nil)
       client = provided || check_out
       yield client
     ensure
-      check_in(client) unless provided
+      check_in(client) if client && !provided
     end
 
     # This method is called to execute a prepared statement

spec/lib/mysql_framework/connector_spec.rb

@@ -425,4 +425,23 @@
       end
     end
   end
+
+  describe 'when connection pool is exhausted' do
+    before do
+      max_pool_size.times { subject.check_out }
+    end
+
+    it 'pop throws exception' do
+      expect { subject.connections.pop(true) }.to raise_error(ThreadError)
+    end
+
+    it 'throws exception on query' do
+      expect { subject.query('SELECT 1') }.to raise_error(RuntimeError, /depleted/)
+    end
+
+    it 'does not put nil in the pool on error' do
+      expect(subject).to_not receive(:check_in).with(nil)
+      expect { subject.query('SELECT 1') }.to raise_error(RuntimeError, /depleted/)
+    end
+  end
 end