json2sql 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '081df2cfbe162d78f93d112d4566e0639af9770ba8f26b4cba40e98d518cf749'
-  data.tar.gz: 45c1664023f707fe8c09a18a2d184d6af26ac199534ce92f6cb1b969a234a7e7
+  metadata.gz: 47b47f1de5a006ae89f030877af6c876d550ee0588efbe1561fc16910f08704c
+  data.tar.gz: 00262e8bad2ab2846a7bbb21a81d7554ca5b7e4eb776ba130f0e156eb84dacae
 SHA512:
-  metadata.gz: 7fac86cfbbd4aca360ae717528e4bbb43a3d98e9e452e4e339f30a07d9cb19f11498cbd7ae9640509ce934dc2efc0aec401685e43bfd82e9e9ef4e17d768376f
-  data.tar.gz: 01b3370c8936fde70bf803cb257095ae778e008fa63ca98b0eac8f28c2a0b430a0dfc8492aec4ec49eafa4adddd49464e63306d752426e1058a9ec21ed0a258a
+  metadata.gz: cb923a2ad4a85e7925b3ea44dc7b6f5fab6f05c18ebbcf9fa6cb03f6352f31d6e791fae45651177360b4fd903f596b102fd5e50011569b01f6315d645eaccb2c
+  data.tar.gz: 3e2e61950bf948b1fe4028a2fd7b21c64489568be3198474cfed51ac65dda748cc6f48e864ebe4040cd35e59d22b2e7a736f3b0b703f6d6c6d0a4746dbeb865e

data/lib/json2sql/select_model.rb

@@ -175,6 +175,25 @@ module Json2sql
 
       columns.each do |column|
 
+        if column.is_a?(Hash)
+
+          alias_name = column["alias"].to_s
+
+          next if alias_name.empty?
+
+          @sql << ", " if @sep
+
+          @sep = true
+
+          @sql << build_function(column)
+
+          @sql << " AS "
+
+          @sql << Sanitizer.keyword_wrap(alias_name)
+
+          next
+        end
+
         next unless column.is_a?(String) || column.is_a?(Symbol)
 
         @sql << ", " if @sep
@@ -197,6 +216,25 @@ module Json2sql
 
       columns.each do |column|
 
+        if column.is_a?(Hash)
+
+          alias_name = column["alias"].to_s
+
+          next if alias_name.empty?
+
+          @sql << ", " if @sep
+
+          @sep = true
+
+          @sql << Sanitizer.keyword_wrap(alias_name, "'")
+
+          @sql << ", "
+
+          @sql << build_function(column)
+
+          next
+        end
+
         next unless column.is_a?(String) || column.is_a?(Symbol)
 
         @sql << ", " if @sep
@@ -277,6 +315,37 @@ module Json2sql
       end
     end
 
+    # Builds a SQL function call expression: FUNC_NAME(`table`.`col1`, ...)
+
+    def build_function(column)
+
+      function = Sanitizer.keyword(column["function"].to_s)
+
+      expression = +"#{function}("
+
+      glue = false
+
+      col_params = column["params"]
+
+      if col_params.is_a?(Array)
+
+        col_params.each do |param|
+
+          next unless param.is_a?(String) || param.is_a?(Symbol)
+
+          expression << ", " if glue
+
+          glue = true
+
+          expression << Sanitizer.keyword_wrap(@table) << "." << Sanitizer.keyword_wrap(param.to_s)
+        end
+      end
+
+      expression << ")"
+
+      expression
+    end
+
     def build_order(params)
 
       order = params["order"]

data/lib/json2sql/version.rb

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

data/lib/json2sql/where_model.rb

@@ -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"

metadata

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