sql-builder 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19d3718663d028bfb26456ed26d37bef8773af4bc5af7517f83ba9d12bc3e815
-  data.tar.gz: 2fd4be4491fe37ced91535589fe90f09ed19247aa7497e32a7682bbe40253913
+  metadata.gz: c0a3fd641323692f816ad2e0abf5f41b46d7dd3b0055226841fd6131e09d0f2d
+  data.tar.gz: f41696caa9026690a154c58d3f98450a5589124bfb3369392768f305a675acec
 SHA512:
-  metadata.gz: 44c08df9d1c813786ac7dfc1e1b72f03a88b8c47068b1c92f7558ee2535285990d18c7c379621a3bbf33c1ffb30bfc76011bcd5bdd001e16f0138174f8183ff0
-  data.tar.gz: 3b135e795750774e7b68b604f1a1c7b7495a72da7852ecd9c97660f583b939289be9ba30af6c4f20d070b32ee77ae383bd5f34573e7552ce9758747dccecd80c
+  metadata.gz: 7747d4c0791354b5e41d6d1b7fb652c69fd851ee13ac513564081852edc484d3f8344239ff2296da81424549df43f09098ce9d0d096c7fa728f6a7a299b85be1
+  data.tar.gz: 870ad3d029b5d31b6747981fcc16fac8a256adaebaa32ab1aaa7b87835f20fa95804ee3e099fd83f0be0323dc3abd9cb4c5834383920c5ad4475ebcf69138819

data/README.md

@@ -63,6 +63,21 @@ WHERE age >= 18 AND status = 3 AND created_at >= '2020-01-03 10:54:08 +0800' AND
 ORDER BY id desc LIMIT 100 OFFSET 0
 ```
 
+## Or
+
+```rb
+query = SQLBuilder.new("SELECT * FROM users")
+  .where("age = ?", 20).where(num: 10)
+query = query.or(SQLBuilder.new.where("gender = ? AND name = ?", 1, "hello world"))
+query.order("id DESC").limit(100).to_sql
+```
+
+Returns string SQL:
+
+```sql
+SELECT * FROM users WHERE age = 20 AND num = 10 OR gender = 1 AND name = 'hello world' ORDER BY id DESC LIMIT 100 
+```
+
 ### Group by, Having
 
 ```rb
@@ -77,12 +92,6 @@ returns
 ```sql
 select user_id, name, count(ip) as ip_count from user_visits WHERE status = 1 AND status = 1 AND created_at > '2020-01-03 10:54:08 +0800' GROUP BY user_id, name HAVING count(ip) > 2"
 ```
-
-## TODO
-
-- [ ] `OR` conditions;
-- [x] `Group By`, `Having`;
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/sql-builder/builder.rb

@@ -12,6 +12,7 @@ require "active_record"
 #      .to_sql
 class SQLBuilder
   attr_reader :sql, :conditions, :havings, :orders, :groups, :limit_options, :page_options
+  attr_accessor :ors
 
   # Create a new SQLBuilder
   #
@@ -26,8 +27,9 @@ class SQLBuilder
     @orders = []
     @groups = []
     @havings = []
+    @ors = []
     @limit_options = {}
-    @page_options = { per_page: 20 }
+    @page_options = {per_page: 20}
   end
 
   # Add `AND` condition
@@ -90,11 +92,11 @@ class SQLBuilder
   #   query.group("name").group("age").to_sql # => "GROUP BY name, age"
   #
   def group(*args)
-    case args.first
+    @groups += case args.first
     when Array
-      @groups += args.first.collect(&:to_s)
+      args.first.collect(&:to_s)
     else
-      @groups += args.collect(&:to_s)
+      args.collect(&:to_s)
     end
 
     @groups.uniq!
@@ -111,6 +113,20 @@ class SQLBuilder
     self
   end
 
+  # Or
+  #
+  #   query.or(query.where(num: 1)).to_sql # => "OR num = 1"
+  #
+  def or(other)
+    if other.is_a?(SQLBuilder)
+      ors << other.ors if other.ors.any?
+      ors << other.conditions if other.conditions.any?
+    else
+      raise ArgumentError, "You have passed #{other.class.name} object to #or. Pass an SQLBuilder object instead."
+    end
+    self
+  end
+
   # Pagination
   #
   #   query.page(1).per(12).to_sql # => "LIMIT 12 OFFSET 0"
@@ -128,7 +144,7 @@ class SQLBuilder
   # See #page
   def per(per_page)
     page_options[:per_page] = per_page
-    self.page(page_options[:page])
+    page(page_options[:page])
     self
   end
 
@@ -138,6 +154,9 @@ class SQLBuilder
     if conditions.any?
       sql_parts << "WHERE " + conditions.flatten.join(" AND ")
     end
+    if ors.any?
+      sql_parts = extract_sql_parts(sql_parts, ors)
+    end
     if orders.any?
       sql_parts << "ORDER BY " + orders.flatten.join(", ")
     end
@@ -161,7 +180,7 @@ class SQLBuilder
   # 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)
+    when Hash then sanitize_sql_hash_for_assignment(assignments.first)
     else
       sanitize_sql_array(assignments)
     end
@@ -182,4 +201,23 @@ class SQLBuilder
     return ary if ActiveRecord.version < Gem::Version.new("5.0.0")
     ActiveRecord::Base.send(:sanitize_sql_for_order, ary)
   end
+
+  def extract_sql_parts(sql_parts, ors)
+    if ors.is_a?(Array)
+      ors.each do |single_or|
+        next unless single_or.is_a?(Array)
+
+        if begin
+          single_or[0][0].is_a?(Array)
+        rescue
+          false
+        end
+          extract_sql_parts(sql_parts, single_or)
+        else
+          sql_parts << "OR " + single_or.flatten.join(" AND ")
+        end
+      end
+    end
+    sql_parts
+  end
 end

data/lib/sql-builder/version.rb

@@ -1,3 +1,3 @@
 class SQLBuilder
-  VERSION = "0.4.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-builder
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple SQL builder for generate SQL for non-ActiveRecord supports databases.
 email:
 - huacnlee@gmail.com
@@ -99,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A simple SQL builder for generate SQL for non-ActiveRecord supports databases