json2sql 1.0.16 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f16dc1347524e05a3b12ea619883c5cfec2ebf86c13df6954f549fb7f7d934
-  data.tar.gz: 6590f96be14c84a510368e25bf875e5223825162b39b1bb3d06f075a6c43a1cc
+  metadata.gz: 618340f3aa421355f5cc948d54c1f974470511f8c3aa437329616a03b206b5e0
+  data.tar.gz: 392631d8f2da7a660697f01ec7a13021d4ea5a87417cf58180be2dd15caf74f5
 SHA512:
-  metadata.gz: 51c4cc95f0a1fb7d529b2366515a0661f48c26cd6c28da176c0e58f7c7bb7f900853e1ce1ffa76c84cfc65797eab3bae6cecac1fd88558fc70c429253005c9d6
-  data.tar.gz: 6a6d13a1d6ba250e52fc7a87f5e3f99852d815cbf6bd34b34a170972a478c35df2836cb124959e662b3abd2fb4d8294cb3deb087fd1d80ba2c044eda4416c96b
+  metadata.gz: 7188db0f32412eb1f66d7d459252ecd747b7227c76d2523b1bba45ecc10737055750346a655c83f1239a0b4f131f4cf67166ebc72ea3f6e21480e5adabbfd3db
+  data.tar.gz: 1596d94d6774787a273fb7d554b06469f0e5efc1b1ed07829d853eb097a0c6b08c31f55e35f5dae894ab6613bb08aaf0dac28542b55ed971422cc43fd6eea3e2

data/lib/json2sql/query_policy.rb

@@ -14,8 +14,7 @@ module Json2sql
   #                       children: { child_table => { columns: [...], ... } },
   #                       parents:  { parent_table => { columns: [...], ... } },
   #                       where: { "and" => { col => val } } } }
-  #     columns:  column list — filtered by `mode` (allowed or denied).
-  #               nil or absent = no column restriction for that table.
+    #     columns:  Array — filtered by `mode` (allowed or denied).
   #     children: nested hash of allowed/denied child tables with their own config.
   #               nil or absent = no restriction on children.
   #               In :deny mode: a child relation is removed only when all its
@@ -97,9 +96,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)
@@ -134,31 +133,35 @@ module Json2sql
     # Filters "columns" using mode (:allow or :deny).
     # Handles Array (SELECT) and Hash (INSERT/UPDATE) column formats.
     # Hash entries (function columns) always pass through in :allow mode.
-    # If no column list is defined: in :allow mode all columns are blocked;
-    # in :deny mode columns are untouched.
 
     def filter_columns(params, config)
 
-      columns = params["columns"]
+      param_columns = params["columns"] || []      
 
-      return unless columns.is_a?(Array) || columns.is_a?(Hash)
+      config_columns = config["columns"] || []
 
-      list = config["columns"]
+      if @mode == :deny
 
-      if !list.is_a?(Array)
-        params["columns"] = columns.is_a?(Array) ? [] : {} if @mode == :allow
-        return
-      end
+        if param_columns.is_a?(Array)
 
-      params["columns"] = if @mode == :deny
+          params["columns"] = param_columns.reject { |c| config_columns.include?(c) }
 
-        columns.is_a?(Array) ? columns.reject { |c| list.include?(c) } : columns.reject { |k, _| list.include?(k) }
+          return
+        end
 
-      else
+        params["columns"] = param_columns.reject { |k, _| config_columns.include?(k) }
 
-        columns.is_a?(Array) ? columns.select { |c| c.is_a?(Hash) || list.include?(c) } : columns.select { |k, _| list.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.18"
 end

metadata

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