pod4 0.7.2 → 0.8.0

data/spec/mri/tds_interface_spec.rb

@@ -30,6 +30,12 @@ class BadTdsInterface2 < TdsInterface
   set_id_fld :id
 end
 
+class ProdTdsInterface < TdsInterface
+  set_db     :pod4_test
+  set_table  :product
+  set_id_fld :code
+end
+
 
 describe TestTdsInterface do
 
@@ -42,10 +48,14 @@ describe TestTdsInterface do
     client.execute(%Q|
       if exists (select * from INFORMATION_SCHEMA.TABLES 
                      where TABLE_NAME   = 'customer' 
-                       AND TABLE_SCHEMA = 'dbo' )
-            drop table dbo.customer;| ).do
+                       and TABLE_SCHEMA = 'dbo' )
+            drop table dbo.customer;
+
+      if exists (select * from INFORMATION_SCHEMA.TABLES 
+                     where TABLE_NAME   = 'product' 
+                       and TABLE_SCHEMA = 'dbo' )
+            drop table dbo.product;
 
-    client.execute(%Q|
       create table dbo.customer ( 
         id        int identity(1,1) not null,
         name      nvarchar(max),
@@ -53,7 +63,11 @@ describe TestTdsInterface do
         day       date         null,
         timestamp datetime     null,
         price     money        null,
-        qty       numeric(5,2) null );| ).do
+        qty       numeric(5,2) null );
+
+      create table dbo.product (
+        code nvarchar(20),
+        name nvarchar(max) );| ).do
 
   ensure
     client.close if client
@@ -64,6 +78,10 @@ describe TestTdsInterface do
     @data.each{|r| ifce.create(r) }
   end
 
+  def fill_product_data(ifce)
+    ifce.create( {code: "foo", name: "bar"} )
+  end
+
 
   before(:all) do
     @connect_hash = DB[:tds]
@@ -104,6 +122,10 @@ describe TestTdsInterface do
     TestTdsInterface.new(@connect_hash)
   end
 
+  let(:prod_interface) do
+    ProdTdsInterface.new(@connect_hash)
+  end
+
   #####
 
 
@@ -113,6 +135,7 @@ describe TestTdsInterface do
       TestTdsInterface.new(@connect_hash)
     end
 
+
     let(:record) { {name: 'Barney'} }
 
   end
@@ -252,20 +275,29 @@ describe TestTdsInterface do
       expect( interface.read(id).to_h ).to include ot.to_h
     end
 
-    it 'shouldnt have a problem with record values of nil' do
+    it 'shouldn\'t have a 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 'shouldnt have a problem with strings containing special characters' do
+    it 'shouldn\'t have a 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
+      hash = {code: "foo", name: "bar"}
+      id = prod_interface.create( Octothorpe.new(hash) )
+
+      expect( id ).to eq "foo"
+      expect{ prod_interface.read("foo") }.not_to raise_exception
+      expect( prod_interface.read("foo").to_h ).to include hash
+    end
+
   end
   ##
 
@@ -325,6 +357,14 @@ describe TestTdsInterface do
       expect( price ).to eq @data.first[:price]
     end
 
+    it 'shouldn\'t have a problem with non-integer keys' do
+      # this is a 100% overlap with the create test above...
+      fill_product_data(prod_interface)
+
+      expect{ prod_interface.read("foo") }.not_to raise_exception
+      expect( prod_interface.read("foo").to_h ).to include(code: "foo", name: "bar")
+    end
+
   end
   ##
 
@@ -395,26 +435,32 @@ describe TestTdsInterface do
 
     end
 
-    it 'shouldnt have a problem with record values of nil' do
+    it 'shouldn\'t have a 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 'shouldnt have a problem with strings containing special characters' do
+    it 'shouldn\'t have a 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
+      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
   ##
 
 
   describe '#delete' do
 
-    def list_contains(id)
-      interface.list.find {|x| x[interface.id_fld] == id }
+    def list_contains(ifce, id)
+      ifce.list.find {|x| x[ifce.id_fld] == id }
     end
 
     let(:id) { interface.list.first[:id] }
@@ -427,9 +473,16 @@ describe TestTdsInterface do
     end
 
     it 'makes the record at ID go away' do
-      expect( list_contains(id) ).to be_truthy
+      expect( list_contains(interface, id) ).to be_truthy
       interface.delete(id)
-      expect( list_contains(id) ).to be_falsy
+      expect( list_contains(interface, id) ).to be_falsy
+    end
+
+    it 'shouldn\'t have a 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
@@ -504,5 +557,22 @@ describe TestTdsInterface do
   ##
 
 
+  describe "#escape" do
+    # This just wraps the TinyTDS escape method, and we don't really know what that does.
+    # But at the very least it should deal with ' inside a string.
+    # Frankly? I suspect that that's all it does.
+
+    it "returns a simple String unchanged" do
+      expect( interface.escape "foo" ).to eq %Q|foo|
+    end
+
+    it "turns a single quote into a doubled single quote" do
+      expect( interface.escape "G'Kar" ).to eq %Q|G''Kar|
+    end
+
+  end
+  ##
+
+  
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod4
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Andy Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devnull
@@ -70,6 +70,7 @@ files:
 - lib/pod4/param.rb
 - lib/pod4/pg_interface.rb
 - lib/pod4/sequel_interface.rb
+- lib/pod4/sql_helper.rb
 - lib/pod4/tds_interface.rb
 - lib/pod4/typecasting.rb
 - lib/pod4/version.rb
@@ -85,11 +86,14 @@ files:
 - spec/common/null_interface_spec.rb
 - spec/common/param_spec.rb
 - spec/common/pod4_spec.rb
+- spec/common/sequel_interface_pg_spec.rb
 - spec/common/shared_examples_for_interface.rb
 - spec/common/spec_helper.rb
+- spec/common/sql_helper_spec.rb
 - spec/doc_no_pending.rb
 - spec/fixtures/database.rb
-- spec/jruby/pg_interface_spec.rb
+- spec/jruby/sequel_interface_jdbc_ms_spec.rb
+- spec/jruby/sequel_interface_jdbc_pg_spec.rb
 - spec/mri/pg_interface_spec.rb
 - spec/mri/sequel_interface_spec.rb
 - spec/mri/tds_interface_spec.rb
@@ -129,11 +133,14 @@ test_files:
 - spec/common/null_interface_spec.rb
 - spec/common/param_spec.rb
 - spec/common/pod4_spec.rb
+- spec/common/sequel_interface_pg_spec.rb
 - spec/common/shared_examples_for_interface.rb
 - spec/common/spec_helper.rb
+- spec/common/sql_helper_spec.rb
 - spec/doc_no_pending.rb
 - spec/fixtures/database.rb
-- spec/jruby/pg_interface_spec.rb
+- spec/jruby/sequel_interface_jdbc_ms_spec.rb
+- spec/jruby/sequel_interface_jdbc_pg_spec.rb
 - spec/mri/pg_interface_spec.rb
 - spec/mri/sequel_interface_spec.rb
 - spec/mri/tds_interface_spec.rb