sql-builder 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 150ba78258f5b3cb152890b76982b01652a5a779bfd4aecfbb1591e0ab7820ad
-  data.tar.gz: 726c4b1b6b4d7a522d02848059285529c924ad6109b367bd2fe42cb77f97f26e
+  metadata.gz: 5bcc084c0688d944d96e0ee1714b177d32c879cac4d1ef3fae67cd05ada5a47b
+  data.tar.gz: 5d31a28f462ba242b1d473bda0305796c6b9862c5b2b4e4f94c1861fb03579ab
 SHA512:
-  metadata.gz: d912e64843705a78564aed481d87f1dd00959cd80b33583f7cd7b9cdb12b4cf7bf0693d3f9041972a0e00deeb79037905fef68d733aac1e20958e67119c8aca5
-  data.tar.gz: 338b7ae715a9c01144a228d5e752db1007fb21504463b58ff69fc9a5201a2d032b317f817b236f628adad540cea113b3bfb3143086ee485bf91c90b1798cf741
+  metadata.gz: f3adb6c21540df083abf0c1480c314acae8362191e0389cba9318ca86d716f286eaa02f9a600b369228d341e0984e297b8cc699d5df9ded21938d596f1752863
+  data.tar.gz: 5cd5ad219554c76dcf07561cbf094d3ab5306a531e6b3414461bbc8b376e4f850328602b8ab0af9275fab0b87aa8dc2071127309e8ebc1ce2c4424120e8d20ea

data/README.md

@@ -47,7 +47,7 @@ Add the conditions by request params:
 
 ```ruby
 query.where("age >= ?", params[:age]) unless params[:age].blank?
-query.where("status = ?", params[:status]) unless params[:status].nil?
+query.where(status: params[:status]) unless params[:status].nil?
 if params[:created_at_from] && params[:created_at_to]
   query.where("created_at >= ? and created_at <= ?", params[:created_at_from], params[:created_at_to])
 end
@@ -67,7 +67,7 @@ ORDER BY id desc LIMIT 100 OFFSET 0
 
 ```rb
 query = SQLBuilder.new("select user_id, name, count(ip) as ip_count from user_visits")
-query.where("status = ?", 1).where("created_at > ?", params[:created_at])
+query.where(status: 1).where("created_at > ?", params[:created_at])
 query.group("user_id").group("name").having("count(ip) > 2")
 query.to_sql
 ```

data/lib/sql-builder/builder.rb

@@ -12,7 +12,7 @@ require "active_record"
 #      .to_sql
 class SQLBuilder
   attr_reader :sql, :conditions, :havings, :orders, :groups, :limit_options, :page_options
-  delegate :sanitize_sql, :sanitize_sql_for_order, to: ActiveRecord::Base
+  delegate :sanitize_sql_array, :sanitize_sql_for_order, to: ActiveRecord::Base
 
   # Create a new SQLBuilder
   #
@@ -44,7 +44,7 @@ class SQLBuilder
       query_scope = condition.first
       @conditions = query_scope.conditions
     else
-      conditions << sanitize_sql(condition)
+      conditions << sanitize_sql_for_assignment(condition)
     end
 
     self
@@ -108,7 +108,7 @@ class SQLBuilder
   #   # => "GROUP BY name HAVING count(name) > 5"
   #
   def having(*condition)
-    havings << sanitize_sql(condition)
+    havings << sanitize_sql_for_assignment(condition)
     self
   end
 
@@ -137,16 +137,16 @@ class SQLBuilder
   def to_sql
     sql_parts = [sql]
     if conditions.any?
-      sql_parts << "WHERE " + conditions.join(" AND ")
+      sql_parts << "WHERE " + conditions.flatten.join(" AND ")
     end
     if orders.any?
-      sql_parts << "ORDER BY " + orders.join(", ")
+      sql_parts << "ORDER BY " + orders.flatten.join(", ")
     end
     if groups.any?
-      sql_parts << "GROUP BY " + groups.join(", ")
+      sql_parts << "GROUP BY " + groups.flatten.join(", ")
     end
     if havings.any?
-      sql_parts << "HAVING " + havings.join(" AND ")
+      sql_parts << "HAVING " + havings.flatten.join(" AND ")
     end
     if limit_options[:limit]
       sql_parts << "LIMIT " + limit_options[:limit].to_s
@@ -156,4 +156,22 @@ class SQLBuilder
     end
     sql_parts.join(" ")
   end
+
+  private
+
+  # https://api.rubyonrails.org/classes/ActiveRecord/Sanitization/ClassMethods.html#method-i-sanitize_sql_for_assignment
+  def sanitize_sql_for_assignment(assignments)
+    case assignments.first
+    when Hash; sanitize_sql_hash_for_assignment(assignments.first)
+    else
+      sanitize_sql_array(assignments)
+    end
+  end
+
+  # https://api.rubyonrails.org/classes/ActiveRecord/Sanitization/ClassMethods.html#method-i-sanitize_sql_hash_for_assignment
+  def sanitize_sql_hash_for_assignment(attrs)
+    attrs.map do |attr, value|
+      sanitize_sql_array(["#{attr} = ?", value])
+    end
+  end
 end

data/lib/sql-builder/version.rb

@@ -1,3 +1,3 @@
 class SQLBuilder
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-builder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord