json2sql 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f16dc1347524e05a3b12ea619883c5cfec2ebf86c13df6954f549fb7f7d934
-  data.tar.gz: 6590f96be14c84a510368e25bf875e5223825162b39b1bb3d06f075a6c43a1cc
+  metadata.gz: 93c1247f7047a25a4a0250cac5d5613c313ccbc81e08f7d3a80a86741ecadf99
+  data.tar.gz: eb70aef8f428ae377e19eb4e7d1b379583ce59f41cbaa899f6a94929a314e398
 SHA512:
-  metadata.gz: 51c4cc95f0a1fb7d529b2366515a0661f48c26cd6c28da176c0e58f7c7bb7f900853e1ce1ffa76c84cfc65797eab3bae6cecac1fd88558fc70c429253005c9d6
-  data.tar.gz: 6a6d13a1d6ba250e52fc7a87f5e3f99852d815cbf6bd34b34a170972a478c35df2836cb124959e662b3abd2fb4d8294cb3deb087fd1d80ba2c044eda4416c96b
+  metadata.gz: b3c7751decd988513996816c794cfde5e956eeca54372814b4cb85b42f7a2108cc55bcfca433ae3c0f15c8c422050540fb2b7b5630626f9f3fd33697ce2f283b
+  data.tar.gz: 1ab3701997f7d51b7378a7865836e9acb420510b160d359365627baebb814c7c18aea1f9d0e111125bf4a1500e1dd517a7cdcfe79118fe21ec74937638eeff60

data/lib/json2sql/query_policy.rb

@@ -97,9 +97,9 @@ module Json2sql
 
       return false unless params.is_a?(Hash)
 
-      cols = params["columns"]
+      columns = params["columns"]
 
-      (cols.is_a?(Array) || cols.is_a?(Hash)) && cols.empty?
+      (columns.is_a?(Array) || columns.is_a?(Hash)) && columns.empty?
     end
 
     def filter_tables(params, config)
@@ -139,26 +139,44 @@ module Json2sql
 
     def filter_columns(params, config)
 
-      columns = params["columns"]
+      param_columns = params["columns"]
+
+      return unless param_columns.is_a?(Array) || param_columns.is_a?(Hash)
 
-      return unless columns.is_a?(Array) || columns.is_a?(Hash)
+      config_columns = config["columns"]
 
-      list = config["columns"]
+      unless config_columns.is_a?(Array)
+
+        if @mode == :allow
+
+          params["columns"] = param_columns.is_a?(Array) ? [] : {}
+        end
 
-      if !list.is_a?(Array)
-        params["columns"] = columns.is_a?(Array) ? [] : {} if @mode == :allow
         return
       end
 
-      params["columns"] = if @mode == :deny
+      if @mode == :deny
+
+        if param_columns.is_a?(Array)
 
-        columns.is_a?(Array) ? columns.reject { |c| list.include?(c) } : columns.reject { |k, _| list.include?(k) }
+          params["columns"] = param_columns.reject { |c| config_columns.include?(c) }
 
-      else
+          return
+        end
 
-        columns.is_a?(Array) ? columns.select { |c| c.is_a?(Hash) || list.include?(c) } : columns.select { |k, _| list.include?(k) }
+        params["columns"] = param_columns.reject { |k, _| config_columns.include?(k) }
 
+        return
+      end
+
+      if param_columns.is_a?(Array)
+
+        params["columns"] = param_columns.select { |c| c.is_a?(Hash) || config_columns.include?(c) }
+        
+        return
       end
+
+      params["columns"] = param_columns.select { |k, _| config_columns.include?(k) }
     end
 
     # Merges forced "and" conditions into params["and"].

data/lib/json2sql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Json2sql
-  VERSION = "1.0.16"
+  VERSION = "1.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json2sql
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Tiago da Silva