json2sql 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3caea0aaaaac6b6bdc5fe29341cf711d7ce2c34a0752fd06bfd246eacfc4c1df
-  data.tar.gz: 49341acb1ed445eaf48ed6dd0cee2fff492105f3f823d7e4d415671acf4208d0
+  metadata.gz: '081df2cfbe162d78f93d112d4566e0639af9770ba8f26b4cba40e98d518cf749'
+  data.tar.gz: 45c1664023f707fe8c09a18a2d184d6af26ac199534ce92f6cb1b969a234a7e7
 SHA512:
-  metadata.gz: '09d2615939602fe80edcec47e521ddf58678aab8c048336795129fdda56061d6a38d109bfc0a4321cfc05298c83df0884a79d097b4e5655e4b544b0f0a4d343b'
-  data.tar.gz: c46959b88dd70ea6f8981ab7ae6484281e77ec75d82dc06a197af7f9cdefdd5566522a1e050e5a910ab0f7463fbd5fdc12ef5705d1a08358d571596b98f7ebf5
+  metadata.gz: 7fac86cfbbd4aca360ae717528e4bbb43a3d98e9e452e4e339f30a07d9cb19f11498cbd7ae9640509ce934dc2efc0aec401685e43bfd82e9e9ef4e17d768376f
+  data.tar.gz: 01b3370c8936fde70bf803cb257095ae778e008fa63ca98b0eac8f28c2a0b430a0dfc8492aec4ec49eafa4adddd49464e63306d752426e1058a9ec21ed0a258a

data/lib/json2sql/select_model.rb

@@ -61,20 +61,20 @@ module Json2sql
       build_offset(params)
     end
 
-    # SELECT JSON_ARRAYAGG(JSON_OBJECT(...)) AS `table`
+    # SELECT COALESCE(JSON_ARRAYAGG(JSON_OBJECT(...)), JSON_ARRAY()) AS `table`
     # FROM LATERAL (SELECT * FROM `table` WHERE ... ORDER ... LIMIT ...) AS `table`
 
     def build_query_array(params)
 
       @sep = false
 
-      @sql << "SELECT JSON_ARRAYAGG(JSON_OBJECT("
+      @sql << "SELECT COALESCE(JSON_ARRAYAGG(JSON_OBJECT("
 
       build_columns_json(params)
       build_columns_array(params)
       build_columns_object(params)
 
-      @sql << ")) AS "
+      @sql << ")), JSON_ARRAY()) AS "
 
       @sql << Sanitizer.keyword_wrap(@table)
 

data/lib/json2sql/version.rb

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

data/lib/json2sql/where_model.rb

@@ -41,26 +41,24 @@ module Json2sql
 
       return unless has_relation || has_where_and || has_where_or
 
-      @sql << " WHERE "
+      parts = []
 
-      if has_relation
+      parts << with_buffer { @relation.build_table_relation(@sql, @table) } if has_relation
 
-        @relation.build_table_relation(@sql, @table)
+      scope = has_where_and ? " AND " : " OR "
+      
+      group = params["and"] || params["or"]
 
-        @sql << " AND " if has_where_and || has_where_or
-      end
-
-      if has_where_and
+      if group
 
-        build_column_group(params["and"], " AND ")
+        frag = build_column_group(group, scope)
 
-        return
+        parts << frag unless frag.empty?
       end
 
-      if has_where_or
+      return if parts.empty?
 
-        build_column_group(params["or"], " OR ")
-      end
+      @sql << " WHERE " << parts.join(" AND ")
     end
 
     private
@@ -71,20 +69,16 @@ module Json2sql
 
     def build_column_group(params, scope)
 
-      @sql << "("
-
-      glue = false
+      fragments = params.filter_map do |key, value|
 
-      params.each do |key, value|
+        frag = with_buffer { build_column_types(value, scope, key.to_s) }
 
-        @sql << scope if glue
-        
-        glue = true
-
-        build_column_types(value, scope, key.to_s)
+        frag.empty? ? nil : frag
       end
 
-      @sql << ")"
+      return "" if fragments.empty?
+
+      "(" + fragments.join(scope) + ")"
     end
 
     # Dispatch by Ruby type of the value.
@@ -92,6 +86,7 @@ module Json2sql
     def build_column_types(params, scope, column)
 
       case params
+
       when TrueClass, FalseClass
 
         build_action_types(params, column, "=")
@@ -108,15 +103,23 @@ module Json2sql
 
         if column == "and"
 
-          build_column_group(params, " AND ")
+          frag = build_column_group(params, " AND ")
+
+          @sql << frag unless frag.empty?
 
-        elsif column == "or"
+          return
+        end
+
+        if column == "or"
+
+          frag = build_column_group(params, " OR ")
 
-          build_column_group(params, " OR ")
+          @sql << frag unless frag.empty?
 
-        else          
-          build_action_group(params, scope, column)
+          return
         end
+
+        build_action_group(params, scope, column)
       end
     end
 
@@ -126,16 +129,14 @@ module Json2sql
 
     def build_action_group(params, scope, column)
 
-      glue = false
-
-      params.each do |key, value|
+      fragments = params.filter_map do |key, value|
 
-        @sql << scope if glue
+        frag = with_buffer { build_action_types(value, column, key.to_s) }
 
-        glue = true
-
-        build_action_types(value, column, key.to_s)
+        frag.empty? ? nil : frag
       end
+
+      @sql << fragments.join(scope) unless fragments.empty?
     end
 
     def build_action_types(params, column, action)
@@ -164,20 +165,20 @@ module Json2sql
     def build_action_values(params, column, action) # rubocop:disable Metrics/MethodLength
 
       case params
+      
       when TrueClass, FalseClass
 
         # Only "null" → IS NULL / IS NOT NULL. Boolean equality is not emitted
         # (matches C++ behaviour — use integer 1/0 for boolean equality).
-        if action == "null"
+        return unless action == "null"
 
-          action_str = params ? " IS " : " IS NOT "
+        action_str = params ? " IS " : " IS NOT "
 
-          @sql << Sanitizer.keyword_wrap(@table) << "."
+        @sql << Sanitizer.keyword_wrap(@table) << "."
 
-          @sql << Sanitizer.keyword_wrap(column)
+        @sql << Sanitizer.keyword_wrap(column)
 
-          @sql << action_str << "NULL"
-        end
+        @sql << action_str << "NULL"
 
       when Integer
 
@@ -238,6 +239,7 @@ module Json2sql
       action_name = get_action(action)
 
       case action_name
+
       when "last"
 
         @sql << Sanitizer.keyword_wrap(@table) << "."
@@ -264,26 +266,20 @@ module Json2sql
 
       else
 
-        if params.start_with?("$.")
+        @sql << Sanitizer.keyword_wrap(@table) << "."
 
-          @sql << Sanitizer.keyword_wrap(@table) << "."
+        @sql << Sanitizer.keyword_wrap(column)
 
-          @sql << Sanitizer.keyword_wrap(column)
+        @sql << " #{action_name} "
 
-          @sql << " #{action_name} "
+        if params.start_with?("$.")
 
           @sql << Sanitizer.reference(params)
 
-        else
-
-          @sql << Sanitizer.keyword_wrap(@table) << "."
-
-          @sql << Sanitizer.keyword_wrap(column)
-
-          @sql << " #{action_name} "
-
-          @sql << Sanitizer.value_wrap(params)
+          return
         end
+
+        @sql << Sanitizer.value_wrap(params)
       end
     end
 
@@ -347,6 +343,26 @@ module Json2sql
       end
     end
 
+    # -------------------------------------------------------------------------
+    # Buffer helper — temporarily swap @sql for a fresh string so that any
+    # downstream << calls are captured in isolation. Returns the captured fragment.
+    # -------------------------------------------------------------------------
+
+    def with_buffer
+
+      saved = @sql
+
+      @sql = +""
+
+      yield
+
+      @sql
+
+    ensure
+
+      @sql = saved
+    end
+
     # -------------------------------------------------------------------------
     # Operator mapping
     # -------------------------------------------------------------------------

metadata

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