json2sql 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ebea9d33eb532bee33d1b8a416d64417517458083b2082fd3397adc9ec4b3b
-  data.tar.gz: cd7534cf1410eb260df0f597d32a067c7ff9f76c91b67eeed48e0b427729baf2
+  metadata.gz: d0e99fbd9cb204b8c8ab64c96c810433474f649cdd80af3b5c6e8f38c8f4f57f
+  data.tar.gz: 3a9ab7dfbee2f9b7509b320edd460b2d8ca177552bfccfac7b10164366628f1a
 SHA512:
-  metadata.gz: 38f2ad63e55b7c5ae3463481cdfd99205416af121c6c85b5a786d871b5c57cd6ad6c77bcb6c1505ced9c1c2f10c4137111c88aa103ff15d9ad1039ace0cd8aa5
-  data.tar.gz: 7f1310994f5734d2cbf42c4ac9bdd8950d060c505c1d1467668ecd02139d03b6c773fcbd7a5ddf02feacca3191e371c245262fdef8bd0cf1fc091e867e311444
+  metadata.gz: de83391fec39ab3b474f4af3a360e0c842e2945c12fcee347507963b397c97b3b9157387758f1a07e9f5bb33e6e7ea675e5fb9f40c9365383c19776fc1c280fd
+  data.tar.gz: e6a6a70bbde21691e4ae1c1991ef4dabeaa4c0596f20a97a71886cf232aeb0b1484aaa2fe3016257d520f8d0aa6e4366a3e90deec85d9671f79d9c9ddcb4c6c9

data/lib/json2sql/select_model.rb

@@ -262,8 +262,6 @@ module Json2sql
 
       return unless children.is_a?(Hash)
 
-      relation = WhereRelation.parent(@table)
-
       children.each do |key, value|
 
         next unless value.is_a?(Hash)
@@ -274,6 +272,10 @@ module Json2sql
 
         tbl = key.to_s
 
+        custom_key = value["key"].is_a?(String) && !value["key"].empty? ? value["key"] : nil
+
+        relation = WhereRelation.parent(@table, custom_key: custom_key)
+
         @sql << Sanitizer.keyword_wrap(tbl, "'")
 
         @sql << ", ("
@@ -293,8 +295,6 @@ module Json2sql
 
       return unless parents.is_a?(Hash)
 
-      relation = WhereRelation.child(@table)
-
       parents.each do |key, value|
 
         next unless value.is_a?(Hash)
@@ -305,6 +305,10 @@ module Json2sql
 
         tbl = key.to_s
 
+        custom_key = value["key"].is_a?(String) && !value["key"].empty? ? value["key"] : nil
+
+        relation = WhereRelation.child(@table, custom_key: custom_key)
+
         @sql << Sanitizer.keyword_wrap(tbl, "'")
 
         @sql << ", ("

data/lib/json2sql/version.rb

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

data/lib/json2sql/where_model.rb

@@ -41,9 +41,9 @@ module Json2sql
 
       return unless has_relation || has_where_and || has_where_or
 
-      parts = []
+      rules = []
 
-      parts << with_buffer { @relation.build_table_relation(@sql, @table) } if has_relation
+      rules << with_buffer { @relation.build_table_relation(@sql, @table) } if has_relation
 
       scope = has_where_and ? " AND " : " OR "
       
@@ -51,14 +51,14 @@ module Json2sql
 
       if group
 
-        frag = build_column_group(group, scope)
+        rule = build_column_group(group, scope)
 
-        parts << frag unless frag.empty?
+        rules << rule unless rule.empty?
       end
 
-      return if parts.empty?
+      return if rules.empty?
 
-      @sql << " WHERE " << parts.join(" AND ")
+      @sql << " WHERE " << rules.join(" AND ")
     end
 
     private
@@ -69,16 +69,16 @@ module Json2sql
 
     def build_column_group(params, scope)
 
-      fragments = params.filter_map do |key, value|
+      rules = params.filter_map do |key, value|
 
-        frag = with_buffer { build_column_types(value, scope, key.to_s) }
+        rule = with_buffer { build_column_types(value, scope, key.to_s) }
 
-        frag.empty? ? nil : frag
+        rule.empty? ? nil : rule
       end
 
-      return "" if fragments.empty?
+      return "" if rules.empty?
 
-      "(" + fragments.join(scope) + ")"
+      "(#{rules.join(scope)})"
     end
 
     # Dispatch by Ruby type of the value.
@@ -103,18 +103,18 @@ module Json2sql
 
         if column == "and"
 
-          frag = build_column_group(params, " AND ")
+          rule = build_column_group(params, " AND ")
 
-          @sql << frag unless frag.empty?
+          @sql << rule unless rule.empty?
 
           return
         end
 
         if column == "or"
 
-          frag = build_column_group(params, " OR ")
+          rule = build_column_group(params, " OR ")
 
-          @sql << frag unless frag.empty?
+          @sql << rule unless rule.empty?
 
           return
         end
@@ -129,14 +129,14 @@ module Json2sql
 
     def build_action_group(params, scope, column)
 
-      fragments = params.filter_map do |key, value|
+      rules = params.filter_map do |key, value|
 
-        frag = with_buffer { build_action_types(value, column, key.to_s) }
+        rule = with_buffer { build_action_types(value, column, key.to_s) }
 
-        frag.empty? ? nil : frag
+        rule.empty? ? nil : rule
       end
 
-      @sql << fragments.join(scope) unless fragments.empty?
+      @sql << rules.join(scope) unless rules.empty?
     end
 
     def build_action_types(params, column, action)
@@ -370,7 +370,6 @@ module Json2sql
     def get_action(action)
 
       case action
-      when "=", "<", ">", "<=", ">=", "!=", "<>" then action
       when "in"    then "IN"
       when "!in"   then "NOT IN"
       when "like"  then "LIKE"

data/lib/json2sql/where_relation.rb

@@ -8,11 +8,13 @@ module Json2sql
 
     attr_reader :table, :kind
 
-    def initialize(table, kind)
+    def initialize(table, kind, custom_key: nil)
 
       @table = table.to_s
 
-      @kind  = kind
+      @kind = kind
+
+      @custom_key = custom_key.is_a?(String) && !custom_key.empty? ? custom_key : nil
     end
 
     # Factory: no relationship (top-level query).
@@ -25,17 +27,17 @@ module Json2sql
     # Factory: foreign key is on the child table pointing to the parent.
     # Produces: `parent`.`child_id` = `current`.`id`
 
-    def self.child(table)
+    def self.child(table, custom_key: nil)
 
-      new(table, CHILD)
+      new(table, CHILD, custom_key: custom_key)
     end
 
     # Factory: foreign key is on the current/parent table pointing to the child.
     # Produces: `current`.`parent_id` = `parent`.`id`
 
-    def self.parent(table)
+    def self.parent(table, custom_key: nil)
 
-      new(table, PARENT)
+      new(table, PARENT, custom_key: custom_key)
     end
 
     # Appends the JOIN condition for this relationship into sql.
@@ -51,7 +53,7 @@ module Json2sql
 
         sql << "."
 
-        sql << build_table_id(current)
+        sql << (@custom_key ? Sanitizer.keyword_wrap(@custom_key) : build_table_id(current))
 
         sql << " = "
 
@@ -68,7 +70,7 @@ module Json2sql
 
         sql << "."
 
-        sql << build_table_id(table)
+        sql << (@custom_key ? Sanitizer.keyword_wrap(@custom_key) : build_table_id(table))
 
         sql << " = "
 

data/lib/json2sql.rb

@@ -28,13 +28,13 @@ module Json2sql
   # Deep-converts all Hash keys to Strings and recurses into nested Hashes
   # and Arrays. Leaves all other values (Integers, Strings, etc.) unchanged.
 
-  def self.normalize(obj)
+  def self.normalize(object)
 
-    return obj.each_with_object({}) { |(k, v), h| h[k.to_s] = normalize(v) } if obj.is_a?(Hash)
+    return object.each_with_object({}) { |(key, value), hash| hash[key.to_s] = normalize(value) } if object.is_a?(Hash)
 
-    return obj.map { |v| normalize(v) } if obj.is_a?(Array)
+    return object.map { |value| normalize(value) } if object.is_a?(Array)
 
-    obj
+    object
   end
 
 end

metadata

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