json2sql 1.0.14 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7388641e5f74990b482a145d6d096ae5612ebb2b8f8def9761c73d193b56c492
-  data.tar.gz: 82fa2ae894923ca9d983b7d082bdd4b33fdab7cfb23f96ba3b8c3ab93052e04a
+  metadata.gz: 39f16dc1347524e05a3b12ea619883c5cfec2ebf86c13df6954f549fb7f7d934
+  data.tar.gz: 6590f96be14c84a510368e25bf875e5223825162b39b1bb3d06f075a6c43a1cc
 SHA512:
-  metadata.gz: e109f0025272b5f8387b6d7f457cd0cd59d3271788b160bd7612f0130abf792d46cab329ead1474e8a201f7481a40f449a66d86f5db759c147eda3447411ffc6
-  data.tar.gz: ff26c02113459a4f8000ab6a59ab7013a1e22546d05fc901359e5b663de57ffc203b90a73c7288d1d737ace6e3385831199249502c24965715be7c8a27712ec1
+  metadata.gz: 51c4cc95f0a1fb7d529b2366515a0661f48c26cd6c28da176c0e58f7c7bb7f900853e1ce1ffa76c84cfc65797eab3bae6cecac1fd88558fc70c429253005c9d6
+  data.tar.gz: 6a6d13a1d6ba250e52fc7a87f5e3f99852d815cbf6bd34b34a170972a478c35df2836cb124959e662b3abd2fb4d8294cb3deb087fd1d80ba2c044eda4416c96b

data/lib/json2sql/query_policy.rb

@@ -95,7 +95,11 @@ module Json2sql
 
     def empty_columns?(params)
 
-      params.is_a?(Hash) && params["columns"].is_a?(Array) && params["columns"].empty?
+      return false unless params.is_a?(Hash)
+
+      cols = params["columns"]
+
+      (cols.is_a?(Array) || cols.is_a?(Hash)) && cols.empty?
     end
 
     def filter_tables(params, config)
@@ -111,7 +115,7 @@ module Json2sql
     
     # Filters children/parents relations in :allow mode.
     # Only relations present as keys in config[relation] pass through.
-    # If config[relation] is absent or not a Hash, relations are untouched.
+    # If config[relation] is absent or not a Hash, all relations are blocked.
     # No-op in :deny mode.
 
     def filter_relations(params, config, relation)
@@ -124,15 +128,14 @@ module Json2sql
 
       config_tables = config[relation]
 
-      return unless config_tables.is_a?(Hash)
-
-      params[relation] = param_tables.select { |table, _| config_tables.key?(table) }
+      params[relation] = config_tables.is_a?(Hash) ? param_tables.select { |table, _| config_tables.key?(table) } : {}
     end
 
     # 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 for the table, columns are untouched.
+    # If no column list is defined: in :allow mode all columns are blocked;
+    # in :deny mode columns are untouched.
 
     def filter_columns(params, config)
 
@@ -142,7 +145,10 @@ module Json2sql
 
       list = config["columns"]
 
-      return unless list.is_a?(Array)
+      if !list.is_a?(Array)
+        params["columns"] = columns.is_a?(Array) ? [] : {} if @mode == :allow
+        return
+      end
 
       params["columns"] = if @mode == :deny
 

data/lib/json2sql/version.rb

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

metadata

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