soql_builder 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e01133aafa8d9360cb78ada93dd1a4d3fcaa9fa671831343202ac0414634f4b6
-  data.tar.gz: ead65eddcefbb4853110254ce559f78c6c620e31c5c7b7c8002166a6b441427d
+  metadata.gz: 4fec9b88d7c0f5058efaa40ba1e8ffcee51deb04d4c35b23b06f7c66eef1d592
+  data.tar.gz: 44ee7df2bbed7541d7b73cf36542556b115e362f23a5241848c1fe9b9b124240
 SHA512:
-  metadata.gz: 97f41e9547619b75cb7534dd0ce4e4486c5bd36e5034e7f689948b295553a0022ba7a00dd47d533a5ee2b60979438d35e31c79242fd9593981de6db9e46b18e1
-  data.tar.gz: 4085a471ed4ed7eddce845f4a34f47174ed934d08800306cac99f0ee71ba5a86abdeb2f07c5f72d369ff1ac1c3aeee3cf86a98cd2451ad4a1d3ce94c7fa26c27
+  metadata.gz: 7bd972ce802d352af0d2e5559739f309b56fde0820291020901ec07b53264d3c4a06037bc2a008ca2f742976df3487137df0b9a330013fe54305641316de9946
+  data.tar.gz: f7bdd7a18dfdabb6918d22ac29067ff15baf727fd6dcbf9c1be1a78c211e73267937653f80eca8c2a3adc5e7778eea39f904df5ea124073e157da581bd299ebd

data/README.md

@@ -1,4 +1,4 @@
-# SOQL-BUILDER (BETA)
+# SOQL-BUILDER
 
 [![Build Status](https://travis-ci.org/AlexAvlonitis/soql-builder.svg?branch=master)](https://travis-ci.org/AlexAvlonitis/soql-builder)
 
@@ -59,6 +59,26 @@ builder.query
 
 ```
 
+**Select query with multiple subqueries**
+
+```ruby
+builder.fields(['Name', 'Contract__r.Name'])
+       .add_subquery(
+         table: 'Account.Quotes',
+         fields: ['Quotes.Name', 'Quotes.id']
+       )
+       .add_subquery(
+         table: 'Account.Contacts',
+         fields: ['Contacts.Name']
+       )
+       .from('Account')
+       .where('id = 1')
+
+builder.query
+=> "select Name, Contract__r.Name, (select Quotes.Name, Quotes.id from Account.Quotes), (select Contacts.Name from Account.Contacts) from Account where id = 1"
+
+```
+
 **Queries can be added one at a time, instead of chaining**
 
 ```ruby

data/lib/soql/query.rb

@@ -2,42 +2,22 @@
 
 module Soql
   class Query
-    attr_accessor :fields, :subquery, :object_table, :where, :limit
-    attr_reader :type
-
     TYPES = {
       select: 'select'
     }.freeze
 
     def initialize
-      @type = ''
-      @fields = []
-      @subquery = { object_table: '', fields: [] }
-      @object_table = ''
-      @where = ''
-      @limit = ''
-    end
-
-    def type=(type)
-      @type = TYPES[type]
+      @query = ''
     end
 
-    def structure_query
-      qs  = type
-      qs += " #{join_fields(fields)}" unless fields.empty?
-      qs += ", (select #{join_fields(subquery[:fields])} from #{subquery[:object_table]})" unless subquery[:fields].empty?
-      qs += " from #{object_table}" unless object_table == ''
-      qs += " where #{where}" unless where == ''
-      qs += " limit #{limit}" unless limit == ''
-      qs
-    end
-
-    def clean
-      @fields = []
-      @subquery = { object_table: '', fields: [] }
-      @object_table = ''
-      @where = ''
-      @limit = ''
+    def structure_query(args = {})
+      @query  = TYPES[args[:type]]
+      @query += " #{join_fields(args[:fields])}" unless args[:fields].empty?
+      @query += join_subqueries(args[:subqueries]) unless args[:subqueries].empty?
+      @query += " from #{args[:object_table]}" unless args[:object_table] == ''
+      @query += " where #{args[:where]}" unless args[:where] == ''
+      @query += " limit #{args[:limit]}" unless args[:limit] == ''
+      @query
     end
 
     private
@@ -45,5 +25,11 @@ module Soql
     def join_fields(fields)
       fields.join(', ')
     end
+
+    def join_subqueries(subqueries)
+      subqueries.map do |subquery|
+        ", (select #{join_fields(subquery[:fields])} from #{subquery[:object_table]})"
+      end.join
+    end
   end
 end

data/lib/soql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Soql
-  VERSION = '1.0.6'.freeze
+  VERSION = '1.0.7'.freeze
 end

data/lib/soql_builder.rb

@@ -5,39 +5,56 @@ require 'soql/query'
 class SoqlBuilder
   def initialize(type:, query: nil)
     @query = query || Soql::Query.new
-    @query.type = type
+    @type = type
+    @fields = []
+    @subqueries = []
+    @subquery = { object_table: '', fields: [] }
+    @object_table = ''
+    @where = ''
+    @limit = ''
   end
 
   def query
-    @query.structure_query
+    @query.structure_query(
+      type: @type,
+      fields: @fields,
+      subqueries: @subqueries,
+      object_table: @object_table,
+      where: @where,
+      limit: @limit
+    )
   end
 
   def clean
-    @query.clean
+    @fields = []
+    @subqueries = []
+    @object_table = ''
+    @where = ''
+    @limit = ''
   end
 
   def fields(fields = [])
-    @query.fields = fields
+    @fields = fields
     self
   end
 
   def add_subquery(table:, fields: [])
-    @query.subquery[:object_table] = table
-    @query.subquery[:fields] = fields
+    @subquery = { object_table: table, fields: fields }
+    @subqueries << @subquery
     self
   end
 
   def from(table)
-    @query.object_table = table
+    @object_table = table
     self
   end
 
   def where(where_condition)
-    @query.where = where_condition
+    @where = where_condition
     self
   end
 
   def limit(limit_number)
-    @query.limit = limit_number.to_s
+    @limit = limit_number.to_s
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soql_builder
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Alex Avlonitis