pod4 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f29b0bd813bbf2094177505acbaea2c3f53fdaa
-  data.tar.gz: 869b71281afe127ed15230298bfad61e070e77d5
+  metadata.gz: 3c33db37048b310a24eb4effcca5a228b7b62fda
+  data.tar.gz: 2c34a1c066c77b8d5d033f9ec61950addcd15105
 SHA512:
-  metadata.gz: b33eaf931088d4d31ad52d560d8a45b969eb402a3c9baf4d22ec8c8bed017cca67de1ee001c23c6625200ee8f6d0c86107ada232e027c4134a69c9c7e73527c7
-  data.tar.gz: dc7a67002ffcd2c3f7911d18e5bbb131c36c41c630ed7ee2c91c6d461d98caafaa2a500877914eec66d90475201a9420b44952ba355265c4990c5db42888b2e1
+  metadata.gz: 5e0c5abefdd694821087dd05ccb60198c3090aba282973390f9add4784f4e780783e91c4e6eb86c29e2fbca14deb2f092b6ef81e1416b3c068f515b03cf4d2f4
+  data.tar.gz: f96672068c235b9297d60a885f5e7c11be57f1262d8e779a5ea2d8e103e8ecfbf6f5a4efd3a6d6fd0eb04cd494922f79d69472a8906563ecfaad3f65ffe67859

data/Gemfile

@@ -18,7 +18,7 @@ group :development, :test do
 
   platforms :ruby do
     gem "sqlite3",  "~> 1.3"
-    gem "tiny_tds", "~> 1.0"
+    gem "tiny_tds", "~> 1.0" # currently pinned to 1.0 because of FreeBDS 0.95 (Centos)
     gem "pg"
   end
 

data/lib/pod4/pg_interface.rb

@@ -257,7 +257,6 @@ module Pod4
       end
 
       @client.cancel 
-
       rows
 
     rescue => e
@@ -418,7 +417,6 @@ module Pod4
     end
 
 
-
     ##
     # Cast a query row
     #
@@ -428,7 +426,6 @@ module Pod4
     # Also, for the pg_jruby gem, type mapping doesn't work at all?
     #
     def cast_row_fudge(row, oids)
-      lBool   =->(s) { s.to_i = 1 || s.upcase == 'TRUE' }
       lFloat  =->(s) { Float(s) rescue s }
       lInt    =->(s) { Integer(s,10) rescue s }
       lTime   =->(s) { Time.parse(s) rescue s }
@@ -447,7 +444,7 @@ module Pod4
             when oid == 790  then lBigDec.(v[1..-1]) # "£1.23"
             when oid == 1082 then lDate.(v)
 
-            when [16, 1560].include?(oid)   then lBool.(v)
+            when [16, 1560].include?(oid)   then cast_bool(v)
             when [700, 701].include?(oid)   then lFloat.(v)
             when [20, 21, 23].include?(oid) then lInt.(v)
             when [1114, 1184].include?(oid) then lTime.(v)
@@ -459,6 +456,23 @@ module Pod4
 
     end
 
+    
+    ##
+    # Given a value from the database which supposedly represents a boolean ... return one.
+    # It might of course be NULL/nil; that's allowed, too.
+    #
+    def cast_bool(val)
+      if val.nil?
+        nil
+      elsif val.is_a? String
+        %w|T TRUE|.include?(val.to_s.upcase)
+      elsif val.respond_to?(:to_i) # String responds to to_i, remember
+        val.to_i == 1
+      else
+        nil
+      end
+    end
+
 
     def read_or_die(id)
       raise CantContinue, "'No record found with ID '#{id}'" if read(id).empty?
@@ -467,8 +481,8 @@ module Pod4
 
     def parse_for_params(sql, vals)
       new_params = sql.scan("%s").map.with_index{|e,i| "$#{i + 1}" }
-      new_vals   = vals.map{|v| v ? quote(v, nil).to_s : nil }
-      
+      new_vals   = vals.map{|v| v.nil? ? nil : quote(v, nil).to_s }
+
       [ sql_subst(sql, *new_params), new_vals ]
     end
 

data/lib/pod4/version.rb

@@ -1,3 +1,3 @@
 module Pod4 
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/spec/jruby/sequel_interface_jdbc_pg_spec.rb

@@ -66,6 +66,7 @@ describe "SequelInterface (JDBC/Pg)" do
            day:       Date.parse("2016-01-01"),
            timestamp: Time.parse('2015-01-01 12:11'),
            qty:       BigDecimal.new("1.24"),
+           flag:      true,
            price:     nil }
 
     d << { name:      'Fred',
@@ -73,6 +74,7 @@ describe "SequelInterface (JDBC/Pg)" do
            day:       Date.parse("2016-02-02"),
            timestamp: Time.parse('2015-01-02 12:22'),
            qty:       BigDecimal.new("2.35"),
+           flag:      false,
            price:     nil }
 
     d << { name:      'Betty',
@@ -80,6 +82,7 @@ describe "SequelInterface (JDBC/Pg)" do
            day:       Date.parse("2016-03-03"),
            timestamp: Time.parse('2015-01-03 12:33'),
            qty:       BigDecimal.new("3.46"),
+           flag:      nil,
            price:     nil }
 
     d
@@ -108,6 +111,7 @@ describe "SequelInterface (JDBC/Pg)" do
         day       date      null,
         timestamp timestamp null,
         price     money     null,
+        flag      boolean   null,
         qty       numeric   null );
     
       create table product (
@@ -266,6 +270,14 @@ describe "SequelInterface (JDBC/Pg)" do
       expect( price ).to eq dibble[:price]
     end
 
+    it 'returns boolean fields as boolean' do
+      [1,2,3].each do |i|
+        flag = interface.read(i).>>.flag
+        expect( [true, false, nil].include? flag ).to be true
+        expect( flag ).to be data[i - 1][:flag]
+      end
+    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)

data/spec/mri/pg_interface_spec.rb

@@ -58,6 +58,7 @@ describe "PgInterface" do
         day       date      null,
         timestamp timestamp null,
         price     money     null,
+        flag      boolean   null,
         qty       numeric   null );
 
       create table product (
@@ -89,6 +90,7 @@ describe "PgInterface" do
                day:       Date.parse("2016-01-01"),
                timestamp: Time.parse('2015-01-01 12:11'),
                price:     BigDecimal.new("1.24"),
+               flag:      true,
                qty:       BigDecimal.new("1.25") }
 
     @data << { name:      'Fred',
@@ -96,6 +98,7 @@ describe "PgInterface" do
                day:       Date.parse("2016-02-02"),
                timestamp: Time.parse('2015-01-02 12:22'),
                price:     BigDecimal.new("2.35"),
+               flag:      false,
                qty:       BigDecimal.new("2.36") }
 
     @data << { name:      'Betty',
@@ -103,6 +106,7 @@ describe "PgInterface" do
                day:       Date.parse("2016-03-03"),
                timestamp: Time.parse('2015-01-03 12:33'),
                price:     BigDecimal.new("3.46"),
+               flag:      nil,
                qty:       BigDecimal.new("3.47") }
 
   end
@@ -332,6 +336,14 @@ describe "PgInterface" do
       expect( price ).to eq @data.first[:price]
     end
 
+    it 'returns boolean fields as boolean' do
+      [1,2,3].each do |i|
+        flag = interface.read(i).>>.flag
+        expect( [true, false, nil].include? flag ).to be true
+        expect( flag ).to be @data[i - 1][:flag]
+      end
+    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)

data/spec/mri/sequel_interface_spec.rb

@@ -53,18 +53,21 @@ describe "SequelInterface" do
            level:     1.23,
            day:       Date.parse("2016-01-01"),
            timestamp: Time.parse('2015-01-01 12:11'),
+           flag:      true,
            price:     BigDecimal.new("1.24") }
 
     d << { name:      'Fred',
            level:     2.34,
            day:       Date.parse("2016-02-02"),
            timestamp: Time.parse('2015-01-02 12:22'),
+           flag:      false,
            price:     BigDecimal.new("2.35") }
 
     d << { name:      'Betty',
            level:     3.45,
            day:       Date.parse("2016-03-03"),
            timestamp: Time.parse('2015-01-03 12:33'),
+           flag:      nil,
            price:     BigDecimal.new("3.46") }
 
     d
@@ -92,6 +95,7 @@ describe "SequelInterface" do
       Float       :level
       Date        :day
       Time        :timestamp
+      TrueClass   :flag
       BigDecimal  :price, :size=>[10.2] # Sequel doesn't support money
     end
 
@@ -123,6 +127,7 @@ describe "SequelInterface" do
         Float       :level
         Date        :day
         Time        :timestamp
+        TrueClass   :flag
         BigDecimal  :price, :size=>[10.2] 
       end
 
@@ -324,6 +329,15 @@ describe "SequelInterface" do
       expect( price ).to eq data.first[:price]
     end
 
+    # Not sure how this passes since SQLite doesn't have a boolean class, but, Sequel handles it.
+    it 'returns boolean fields as boolean' do
+      [1,2,3].each do |i|
+        flag = interface.read(i).>>.flag
+        expect( [true, false, nil].include? flag ).to be true
+        expect( flag ).to be data[i - 1][:flag]
+      end
+    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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod4
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Andy Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devnull