tax_jp 1.8.4 → 1.8.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 07b7f56733bbf993a3a5ceac2a0005411c1244798d5d28b0b3876482d998d654
4
- data.tar.gz: 6a9d6c3f4c1aa132e5f297288acaa24bdbbc32ddbd80051396afaa9e8398048f
3
+ metadata.gz: 25e29bba13829686dc4da5a5a422ed82438a38e203ee22f93642f9bd2facabcf
4
+ data.tar.gz: 351e969326a36f9f41afbd46e626309dd86cfcdaab872dd405dd098904397e76
5
5
  SHA512:
6
- metadata.gz: 784e6c01a44183f175c452d478f363542bf6886fd5805eb95dc3abf038b454fb2ebde7e10f5063d38f631c1468e1a66aff3b238af43723ada20f9e0bf60c5483
7
- data.tar.gz: 697ece7adafb0633ee820b2415bde627d0dc07f13dad31718bbe1ef448d095df15ba376eeb8e71abb0b5c4a37421e54673c439c1025c405a66a6c878cf4e278a
6
+ metadata.gz: 17add79329ce4f5acb07f5c6a9ce01bf43be5e96df7725d917bb11c46e40e42298ba0b1b94e2c7345094198fd51466b404145d5d30f1d66679dbfa9f9d64bb37
7
+ data.tar.gz: 51fcb4c96422e6942aeb9135db917f8f21a927ddaebc323c71ce0acf16390585e55b8fd923460dae6edd2040d5a161622c58fb47318618c9d16c421b3afc3876
@@ -126,9 +126,10 @@ module TaxJp
126
126
  prefecture_code = convert_to_prefecture_code(prefecture)
127
127
 
128
128
  TaxJp::Utils.with_database(DB_PATH) do |db|
129
- sql = String.new('select * from health_insurances ')
130
- sql << 'where valid_from <= ? and valid_until >= ? and (prefecture_code = ? or prefecture_code is null) '
131
- params = [date, date, prefecture_code]
129
+ sql = String.new('select hi.*, wp.child_and_childcare_support from health_insurances hi ')
130
+ sql << 'inner join welfare_pensions wp on (wp.valid_from <= ? and wp.valid_until >= ?) '
131
+ sql << 'where hi.valid_from <= ? and hi.valid_until >= ? and (hi.prefecture_code = ? or hi.prefecture_code is null) '
132
+ params = [date, date, date, date, prefecture_code]
132
133
 
133
134
  ret = nil
134
135
  db.execute(sql, params) do |row|
@@ -1,3 +1,3 @@
1
1
  module TaxJp
2
- VERSION = '1.8.4'
2
+ VERSION = '1.8.5'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tax_jp
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.4
4
+ version: 1.8.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - ichylinux