pod4 0.10.6 → 1.0.0

data/spec/mri/tds_encrypting_spec.rb

@@ -63,7 +63,7 @@ describe "(writing encrypted data via tds_interface)" do
       include Pod4::Encrypting
 
       encrypted_columns :name, :ailment
-      set_key           "dflkasdgklajndgnalkghlgasdgasdghaalsdg"
+      set_key           "dflkasdgklajndgn"
       set_iv_column     :nonce
     end
   end

data/spec/mri/tds_interface_spec.rb

@@ -1,53 +1,14 @@
-require 'pod4/tds_interface'
+require "pod4/tds_interface"
 
-require 'tiny_tds'
-require 'date'
+require "tiny_tds"
+require "date"
 
-require_relative '../common/shared_examples_for_interface'
-require_relative '../fixtures/database'
+require_relative "../common/shared_examples_for_interface"
+require_relative "../fixtures/database"
 
 
 describe "TdsInterface" do
 
-  let(:tds_interface_class) do
-    Class.new TdsInterface do
-      set_db     :pod4_test
-      set_table  :customer
-      set_id_fld :id
-    end
-  end
-
-  let(:schema_interface_class) do
-    Class.new TdsInterface do
-      set_db     :pod4_test
-      set_schema :public
-      set_table  :customer
-      set_id_fld :id
-    end
-  end
-
-  let(:bad_interface_class1) do
-    Class.new TdsInterface do
-      set_db :pod4_test
-      set_table :customer
-    end
-  end
-
-  let(:bad_interface_class2) do
-    Class.new TdsInterface do
-      set_db :pod4_test
-      set_id_fld :id
-    end
-  end
-
-  let(:prod_interface_class) do
-    Class.new TdsInterface do
-      set_db     :pod4_test
-      set_table  :product
-      set_id_fld :code
-    end
-  end
-
   def db_setup(connect)
     client = TinyTds::Client.new(connect)
     client.execute(%Q|use [pod4_test];|).do
@@ -82,7 +43,6 @@ describe "TdsInterface" do
     client.close if client
   end
 
-
   def fill_data(ifce)
     @data.each{|r| ifce.create(r) }
   end
@@ -91,185 +51,261 @@ describe "TdsInterface" do
     ifce.create( {code: "foo", name: "bar"} )
   end
 
+  def float_price(row)
+    row[:price] = row[:price].to_f
+    row
+  end
+
+  def list_contains(ifce, id)
+    ifce.list.find {|x| x[ifce.id_fld] == id }
+  end
+
+  let(:tds_interface_class) do
+    Class.new TdsInterface do
+      set_db     :pod4_test
+      set_table  :customer
+      set_id_fld :id
+    end
+  end
+
+  let(:schema_interface_class) do
+    Class.new TdsInterface do
+      set_db     :pod4_test
+      set_schema :public
+      set_table  :customer
+      set_id_fld :id, autoincrement: true
+    end
+  end
+
+  let(:bad_interface_class1) do
+    Class.new TdsInterface do
+      set_table :customer
+    end
+  end
+
+  let(:bad_interface_class2) do
+    Class.new TdsInterface do
+      set_db :pod4_test
+      set_id_fld :id
+    end
+  end
+
+  let(:prod_interface_class) do
+    Class.new TdsInterface do
+      set_db     :pod4_test
+      set_table  :product
+      set_id_fld :code, autoincrement: false
+    end
+  end
+
+  let(:interface) do
+    tds_interface_class.new(@connect_hash)
+  end
+
+  let(:prod_interface) do
+    prod_interface_class.new(@connect_hash)
+  end
 
   before(:all) do
     @connect_hash = DB[:tds]
     db_setup(@connect_hash)
 
     @data = []
-    @data << { name:      'Barney', 
+    @data << { name:      "Barney", 
                level:     1.23, 
                day:       Date.parse("2016-01-01"),
-               timestamp: Time.parse('2015-01-01 12:11'),
+               timestamp: Time.parse("2015-01-01 12:11"),
                price:     BigDecimal("1.24"), 
                qty:       BigDecimal("1.25") }
 
-    @data << { name:      'Fred', 
+    @data << { name:      "Fred", 
                level:     2.34, 
                day:       Date.parse("2016-02-02"),
-               timestamp: Time.parse('2015-01-02 12:22'),
+               timestamp: Time.parse("2015-01-02 12:22"),
                price:     BigDecimal("2.35"), 
                qty:       BigDecimal("2.36") }
 
-    @data << { name:      'Betty', 
+    @data << { name:      "Betty", 
                level:     3.45, 
                day:       Date.parse("2016-03-03"),
-               timestamp: Time.parse('2015-01-03 12:33'),
+               timestamp: Time.parse("2015-01-03 12:33"),
                price:     BigDecimal("3.46"), 
                qty:       BigDecimal("3.47") }
 
   end
 
-
-  before do
+  before(:each) do
     # TRUNCATE TABLE also resets the identity counter
     interface.execute(%Q|truncate table customer;|)
   end
 
 
-  let(:interface) do
-    tds_interface_class.new(@connect_hash)
-  end
-
-  let(:prod_interface) do
-    prod_interface_class.new(@connect_hash)
-  end
-
-  #####
-
-
-  it_behaves_like 'an interface' do
 
+  it_behaves_like "an interface" do
     let(:interface) do
       tds_interface_class.new(@connect_hash)
     end
 
-
-    let(:record) { {name: 'Barney'} }
+    let(:record) { {name: "Barney"} }
 
   end
-  ##
  
 
-  describe 'TdsInterface.set_db' do
-    it 'takes one argument' do
+  describe "TdsInterface.set_db" do
+
+    it "takes one argument" do
       expect( TdsInterface ).to respond_to(:set_db).with(1).argument
     end
+
   end
-  ##
 
 
-  describe 'TdsInterface.db' do
-    it 'returns the table' do
+  describe "TdsInterface.db" do
+
+    it "returns the table" do
       expect( tds_interface_class.db ).to eq :pod4_test
     end
+
   end
-  ##
 
 
-  describe 'TdsInterface.set_schema' do
-    it 'takes one argument' do
+  describe "TdsInterface.set_schema" do
+
+    it "takes one argument" do
       expect( TdsInterface ).to respond_to(:set_schema).with(1).argument
     end
+
   end
-  ##
 
 
-  describe 'TdsInterface.schema' do
-    it 'returns the schema' do
+  describe "TdsInterface.schema" do
+
+    it "returns the schema" do
       expect( schema_interface_class.schema ).to eq :public
     end
 
-    it 'is optional' do
+    it "is optional" do
       expect{ tds_interface_class.schema }.not_to raise_exception
       expect( tds_interface_class.schema ).to eq nil
     end
+
   end
-  ##
 
 
-  describe 'TdsInterface.set_table' do
-    it 'takes one argument' do
+  describe "TdsInterface.set_table" do
+
+    it "takes one argument" do
       expect( TdsInterface ).to respond_to(:set_table).with(1).argument
     end
+
   end
-  ##
 
 
-  describe 'TdsInterface.table' do
-    it 'returns the table' do
+  describe "TdsInterface.table" do
+
+    it "returns the table" do
       expect( tds_interface_class.table ).to eq :customer
     end
+
   end
-  ##
 
 
-  describe 'TdsInterface.set_id_fld' do
-    it 'takes one argument' do
+  describe "TdsInterface.set_id_fld" do
+
+    it "takes one argument" do
       expect( TdsInterface ).to respond_to(:set_id_fld).with(1).argument
     end
+
+    it "takes an optional second 'autoincrement' argument" do
+      expect{ TdsInterface.set_id_fld(:foo, autoincrement: false) }.not_to raise_error
+    end
+
   end
-  ##
 
 
-  describe 'TdsInterface.id_fld' do
-    it 'returns the ID field name' do
+  describe "TdsInterface.id_ai" do
+
+    it "returns true if autoincrement is true" do
+      expect( schema_interface_class.id_ai ).to eq true
+    end
+
+    it "returns false if autoincrement is false" do
+      expect( prod_interface_class.id_ai ).to eq false
+    end
+
+    it "returns true if autoincrement is not specified" do
+      expect( tds_interface_class.id_ai ).to eq true
+    end
+
+  end # of PgInterface.id_ai
+
+
+  describe "TdsInterface.id_fld" do
+
+    it "returns the ID field name" do
       expect( tds_interface_class.id_fld ).to eq :id
     end
-  end
-  ##
 
+  end
 
-  describe '#new' do
 
-    it 'requires a TinyTds connection string' do
-      expect{ tds_interface_class.new        }.to raise_exception ArgumentError
-      expect{ tds_interface_class.new(nil)   }.to raise_exception ArgumentError
-      expect{ tds_interface_class.new('foo') }.to raise_exception ArgumentError
+  describe "#new" do
 
-      expect{ tds_interface_class.new(@connect_hash) }.not_to raise_exception
+    it "creates a ConnectionPool when passed a TDS connection hash" do
+      ifce = tds_interface_class.new(@connect_hash)
+      expect( ifce._connection ).to be_a ConnectionPool
     end
 
-    it 'requires the table and id field to be defined in the class' do
-      expect{ TdsInterface.new(@connect_hash) }.to raise_exception Pod4Error
+    it "uses the ConnectionPool when given one" do
+      pool = ConnectionPool.new(interface: tds_interface_class)
+      ifce = tds_interface_class.new(pool)
 
-      expect{ bad_interface_class1.new(@connect_hash) }.
-        to raise_exception Pod4Error
+      expect( ifce._connection ).to eq pool
+    end
 
-      expect{ bad_interface_class2.new(@connect_hash) }.
-        to raise_exception Pod4Error
+    it "raises ArgumentError when passed something else" do
+      expect{ tds_interface_class.new        }.to raise_exception ArgumentError
+      expect{ tds_interface_class.new(nil)   }.to raise_exception ArgumentError
+      expect{ tds_interface_class.new("foo") }.to raise_exception ArgumentError
+    end
 
+    it "requires the table and id field to be defined in the class" do
+      expect{ TdsInterface.new(@connect_hash)         }.to raise_exception Pod4Error
+      expect{ bad_interface_class1.new(@connect_hash) }.to raise_exception Pod4Error
+      expect{ bad_interface_class2.new(@connect_hash) }.to raise_exception Pod4Error
     end
 
-  end
-  ##
+  end # of #new
 
 
-  describe '#quoted_table' do
+  describe "#quoted_table" do
 
-    it 'returns just the table when the schema is not set' do
+    it "returns just the table when the schema is not set" do
       expect( interface.quoted_table ).to eq( %Q|[customer]| )
     end
 
-    it 'returns the schema plus table when the schema is set' do
+    it "returns the schema plus table when the schema is set" do
       ifce = schema_interface_class.new(@connect_hash)
       expect( ifce.quoted_table ).to eq( %|[public].[customer]| )
     end
 
-  end
-  ##
+  end # of #quoted_table
 
 
-  describe '#create' do
+  describe "#create" do
+    let(:hash) { {name: "Bam-Bam", price: 4.44} }
+    let(:ot)   { Octothorpe.new(name: "Wilma", price: 5.55) }
 
-    let(:hash) { {name: 'Bam-Bam', price: 4.44} }
-    let(:ot)   { Octothorpe.new(name: 'Wilma', price: 5.55) }
+    it "raises a Pod4::DatabaseError if anything goes wrong" do
+      expect{ interface.create(one: "two") }.to raise_exception DatabaseError
+    end
 
-    it 'raises a Pod4::DatabaseError if anything goes wrong' do
-      expect{ interface.create(one: 'two') }.to raise_exception DatabaseError
+    it "raises an ArgumentError if ID field is missing in hash and not AI" do
+      hash = {name: "bar"}
+      expect{ prod_interface.create(Octothorpe.new hash) }.to raise_error ArgumentError
     end
 
-    it 'creates the record when given a hash' do
+    it "creates the record when given a hash" do
       # kinda impossible to seperate these two tests
       id = interface.create(hash)
 
@@ -277,28 +313,28 @@ describe "TdsInterface" do
       expect( interface.read(id).to_h ).to include hash
     end
 
-    it 'creates the record when given an Octothorpe' do
+    it "creates the record when given an Octothorpe" do
       id = interface.create(ot)
 
       expect{ interface.read(id) }.not_to raise_exception
       expect( interface.read(id).to_h ).to include ot.to_h
     end
 
-    it 'shouldn\'t have a problem with record values of nil' do
-      hash2 = {name: 'Ranger', price: nil}
+    it "has no problem with record values of nil" do
+      hash2 = {name: "Ranger", price: nil}
       expect{ interface.create(hash2) }.not_to raise_exception
       id = interface.create(hash2)
       expect( interface.read(id).to_h ).to include(hash2)
     end
 
-    it 'shouldn\'t have a problem with strings containing special characters' do
+    it "has no problem with strings containing special characters" do
       hash2 = {name: "T'Challa[]", price: nil}
       expect{ interface.create(hash2) }.not_to raise_exception
       id = interface.create(hash2)
       expect( interface.read(id).to_h ).to include(hash2)
     end
 
-    it 'shouldn\'t have a problem with non-integer keys' do
+    it "has no problem with non-integer keys" do
       hash = {code: "foo", name: "bar"}
       id = prod_interface.create( Octothorpe.new(hash) )
 
@@ -307,37 +343,51 @@ describe "TdsInterface" do
       expect( prod_interface.read("foo").to_h ).to include hash
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      interface.create(ot)
+    end
 
+    it "copes with an OT with the ID field in it when the ID field autoincrements" do
+      h = {id: nil, name: "Bam-Bam", qty: 4.44}
+      expect{ interface.create(h) }.not_to raise_error
 
-  describe '#read' do
-    before { fill_data(interface) }
+      id = interface.create(h)
+      expect( id ).not_to be_nil
+      expect{ interface.read(id) }.not_to raise_exception
+      expect( interface.read(id).to_h ).to include( {name: "Bam-Bam", qty: 4.44} )
+    end
 
-    it 'returns the record for the id as an Octothorpe' do
+  end # of #create
+
+
+  describe "#read" do
+    before(:each) { fill_data(interface) }
+
+    it "returns the record for the id as an Octothorpe" do
       rec = interface.read(2)
       expect( rec ).to be_a_kind_of Octothorpe
-      expect( rec.>>.name ).to eq 'Fred'
+      expect( rec.>>.name ).to eq "Fred"
     end
 
-    it 'raises a Pod4::CantContinue if anything goes wrong with the ID' do
+    it "raises a Pod4::CantContinue if anything goes wrong with the ID" do
       expect{ interface.read(:foo) }.to raise_exception CantContinue
     end
 
-    it 'returns an empty Octothorpe if no record matches the ID' do
+    it "returns an empty Octothorpe if no record matches the ID" do
       expect{ interface.read(99) }.not_to raise_exception
       expect( interface.read(99) ).to be_a_kind_of Octothorpe
       expect( interface.read(99) ).to be_empty
     end
 
-    it 'returns real fields as Float' do
+    it "returns real fields as Float" do
       level = interface.read(1).>>.level
 
       expect( level ).to be_a_kind_of Float
       expect( level ).to be_within(0.001).of( @data.first[:level] )
     end
 
-    it 'returns date fields as Date' do
+    it "returns date fields as Date" do
       skip "not supported by TinyTds ¬_¬ "
       date = interface.read(1).>>.day
       
@@ -345,28 +395,28 @@ describe "TdsInterface" do
       expect( date ).to eq @data.first[:day]
     end
 
-    it 'returns datetime fields as Time' do
+    it "returns datetime fields as Time" do
       timestamp = interface.read(1).>>.timestamp
 
       expect( timestamp ).to be_a_kind_of Time
       expect( timestamp ).to eq @data.first[:timestamp]
     end
 
-    it 'returns numeric fields as BigDecimal' do
+    it "returns numeric fields as BigDecimal" do
       qty = interface.read(1).>>.qty
 
       expect( qty ).to be_a_kind_of BigDecimal
       expect( qty ).to eq @data.first[:qty]
     end
 
-    it 'returns money fields as BigDecimal' do
+    it "returns money fields as BigDecimal" do
       price   = interface.read(1).>>.price
 
       expect( price ).to be_a_kind_of BigDecimal
       expect( price ).to eq @data.first[:price]
     end
 
-    it 'shouldn\'t have a problem with non-integer keys' do
+    it "has no problem with non-integer keys" do
       # this is a 100% overlap with the create test above...
       fill_product_data(prod_interface)
 
@@ -374,57 +424,60 @@ describe "TdsInterface" do
       expect( prod_interface.read("foo").to_h ).to include(code: "foo", name: "bar")
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      interface.read(2)
+    end
 
+  end # of #read
 
-  describe '#list' do
-    before { fill_data(interface) }
 
-    it 'has an optional selection parameter, a hash' do
+  describe "#list" do
+    before(:each) { fill_data(interface) }
+
+    it "has an optional selection parameter, a hash" do
       # Actually it does not have to be a hash, but FTTB we only support that.
-      expect{ interface.list(name: 'Barney') }.not_to raise_exception
+      expect{ interface.list(name: "Barney") }.not_to raise_exception
     end
 
-    it 'returns an array of Octothorpes that match the records' do
+    it "returns an array of Octothorpes that match the records" do
       list = interface.list
 
       expect( list.first ).to be_a_kind_of Octothorpe
       expect( list.map{|x| x.>>.name} ).to match_array @data.map{|y| y[:name]}
     end
 
-    it 'returns a subset of records based on the selection parameter' do
-      expect( interface.list(name: 'Fred').size ).to eq 1
+    it "returns a subset of records based on the selection parameter" do
+      expect( interface.list(name: "Fred").size ).to eq 1
 
-      expect( interface.list(name: 'Betty').first.to_h ).
-        to include(name: 'Betty', price: 3.46)
+      expect( interface.list(name: "Betty").first.to_h ).
+        to include(name: "Betty", price: 3.46)
 
     end
 
-    it 'returns an empty Array if nothing matches' do
-      expect( interface.list(name: 'Yogi') ).to eq([])
+    it "returns an empty Array if nothing matches" do
+      expect( interface.list(name: "Yogi") ).to eq([])
     end
 
-    it 'raises DatabaseError if the selection criteria is nonsensical' do
-      expect{ interface.list('foo') }.to raise_exception Pod4::DatabaseError
+    it "raises DatabaseError if the selection criteria is nonsensical" do
+      expect{ interface.list("foo") }.to raise_exception Pod4::DatabaseError
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      interface.list
+    end
+
+  end # of #list
   
 
-  describe '#update' do
-    before { fill_data(interface) }
+  describe "#update" do
+    before(:each) { fill_data(interface) }
 
     let(:id) { interface.list.first[:id] }
 
-    def float_price(row)
-      row[:price] = row[:price].to_f
-      row
-    end
-
-    it 'updates the record at ID with record parameter' do
-      record = {name: 'Booboo', price: 99.99}
+    it "updates the record at ID with record parameter" do
+      record = {name: "Booboo", price: 99.99}
       interface.update(id, record)
 
       # It so happens that TinyTds returns money as BigDecimal --
@@ -432,138 +485,148 @@ describe "TdsInterface" do
       expect( float_price( interface.read(id).to_h ) ).to include(record)
     end
 
-    it 'raises a CantContinue if anything weird happens with the ID' do
-      expect{ interface.update(99, name: 'Booboo') }.
+    it "raises a CantContinue if anything weird happens with the ID" do
+      expect{ interface.update(99, name: "Booboo") }.
         to raise_exception CantContinue
 
     end
 
-    it 'raises a DatabaseError if anything weird happens with the record' do
-      expect{ interface.update(id, smarts: 'more') }.
+    it "raises a DatabaseError if anything weird happens with the record" do
+      expect{ interface.update(id, smarts: "more") }.
         to raise_exception DatabaseError
 
     end
 
-    it 'shouldn\'t have a problem with record values of nil' do
-      record = {name: 'Ranger', price: nil}
+    it "has no problem with record values of nil" do
+      record = {name: "Ranger", price: nil}
       expect{ interface.update(id, record) }.not_to raise_exception
       expect( interface.read(id).to_h ).to include(record)
     end
 
-    it 'shouldn\'t have a problem with strings containing special characters' do
+    it "has no problem with strings containing special characters" do
       record = {name: "T'Challa[]", price: nil}
       expect{ interface.update(id, record) }.not_to raise_exception
       expect( interface.read(id).to_h ).to include(record)
     end
 
-    it 'shouldn\'t have a problem with non-integer keys' do
+    it "has no problem with non-integer keys" do
       fill_product_data(prod_interface)
       expect{ prod_interface.update("foo", name: "baz") }.not_to raise_error
       expect( prod_interface.read("foo").to_h[:name] ).to eq "baz"
     end
 
-  end
-  ##
-
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      record = {name: "Booboo", price: 99.99}
+      interface.update(id, record)
+    end
 
-  describe '#delete' do
+  end # of #update
 
-    def list_contains(ifce, id)
-      ifce.list.find {|x| x[ifce.id_fld] == id }
-    end
 
+  describe "#delete" do
     let(:id) { interface.list.first[:id] }
 
-    before { fill_data(interface) }
+    before(:each) { fill_data(interface) }
 
-    it 'raises CantContinue if anything hinky happens with the ID' do
+    it "raises CantContinue if anything hinky happens with the ID" do
       expect{ interface.delete(:foo) }.to raise_exception CantContinue
       expect{ interface.delete(99)   }.to raise_exception CantContinue
     end
 
-    it 'makes the record at ID go away' do
+    it "makes the record at ID go away" do
       expect( list_contains(interface, id) ).to be_truthy
       interface.delete(id)
       expect( list_contains(interface, id) ).to be_falsy
     end
 
-    it 'shouldn\'t have a problem with non-integer keys' do
+    it "has no problem with non-integer keys" do
       fill_product_data(prod_interface)
       expect( list_contains(prod_interface, "foo") ).to be_truthy
       prod_interface.delete("foo")
       expect( list_contains(prod_interface, "foo") ).to be_falsy
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      interface.delete(id)
+    end
 
+  end # of #delete
 
-  describe '#execute' do
 
-    let(:sql) { 'delete from customer where price < 2.0;' }
+  describe "#execute" do
+    let(:sql) { "delete from customer where price < 2.0;" }
 
-    before { fill_data(interface) }
+    before(:each) { fill_data(interface) }
 
-    it 'requires an SQL string' do
+    it "requires an SQL string" do
       expect{ interface.execute      }.to raise_exception ArgumentError
       expect{ interface.execute(nil) }.to raise_exception ArgumentError
       expect{ interface.execute(14)  }.to raise_exception ArgumentError
     end
 
-    it 'raises some sort of Pod4 error if it runs into problems' do
-      expect{ interface.execute('delete from not_a_table') }.
+    it "raises some sort of Pod4 error if it runs into problems" do
+      expect{ interface.execute("delete from not_a_table") }.
         to raise_exception Pod4Error
 
     end
 
-    it 'executes the string' do
+    it "executes the string" do
       expect{ interface.execute(sql) }.not_to raise_exception
       expect( interface.list.size ).to eq(@data.size - 1)
-      expect( interface.list.map{|r| r[:name] } ).not_to include 'Barney'
+      expect( interface.list.map{|r| r[:name] } ).not_to include "Barney"
     end
 
-  end
-  ##
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      interface.execute(sql)
+    end
 
+  end # of #execute
 
-  describe '#select' do
 
-    before { fill_data(interface) }
+  describe "#select" do
+    before(:each) { fill_data(interface) }
 
-    it 'requires an SQL string' do
+    it "requires an SQL string" do
       expect{ interface.select      }.to raise_exception ArgumentError
       expect{ interface.select(nil) }.to raise_exception ArgumentError
       expect{ interface.select(14)  }.to raise_exception ArgumentError
     end
 
-    it 'raises some sort of Pod4 error if it runs into problems' do
-      expect{ interface.select('select * from not_a_table') }.
+    it "raises some sort of Pod4 error if it runs into problems" do
+      expect{ interface.select("select * from not_a_table") }.
         to raise_exception Pod4Error
 
     end
 
-    it 'returns the result of the sql' do
-      sql1 = 'select name from customer where price < 2.0;'
-      sql2 = 'select name from customer where price < 0.0;'
+    it "returns the result of the sql" do
+      sql1 = "select name from customer where price < 2.0;"
+      sql2 = "select name from customer where price < 0.0;"
 
       expect{ interface.select(sql1) }.not_to raise_exception
-      expect( interface.select(sql1) ).to eq( [{name: 'Barney'}] )
+      expect( interface.select(sql1) ).to eq( [{name: "Barney"}] )
       expect( interface.select(sql2) ).to eq( [] )
     end
 
-    it 'works if you pass a non-select' do
+    it "works if you pass a non-select" do
       # By which I mean: still executes the SQL; returns []
-      sql = 'delete from customer where price < 2.0;'
+      sql = "delete from customer where price < 2.0;"
       ret = interface.select(sql)
 
       expect( interface.list.size ).to eq(@data.size - 1)
-      expect( interface.list.map{|r| r[:name] } ).not_to include 'Barney'
+      expect( interface.list.map{|r| r[:name] } ).not_to include "Barney"
       expect( ret ).to eq( [] )
     end
 
+    it "calls ConnectionPool#client" do
+      expect( interface._connection ).to receive(:client).at_least(:once).and_call_original
+      sql = "delete from customer where price < 2.0;"
+      interface.select(sql)
+    end
 
-  end
-  ##
+  end # of #select
 
 
   describe "#escape" do
@@ -579,9 +642,30 @@ describe "TdsInterface" do
       expect( interface.escape "G'Kar" ).to eq %Q|G''Kar|
     end
 
-  end
-  ##
+  end # of #escape
+
+
+  describe "#new_connection" do
+
+    it "returns a PG Client object" do
+      expect( interface.new_connection @connect_hash ).to be_a TinyTds::Client
+    end
+
+  end # of #new_connection
+
+
+  describe "#close_connection" do
+
+    it "closes the given PG Client object" do
+      client = interface.new_connection(@connect_hash)
+
+      expect( client ).to receive(:close)
+
+      interface.close_connection(client)
+    end
+
+  end # of #close_connection
+
 
-  
 end