soql_builder 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3003ce633f92747de3b8260ee7156bac4ad8aad978be30e1d884f9ef96f65a6
-  data.tar.gz: 0eab09a6d55c77d374b4da34e302313589b6eb7d8d408990e35fb5214a0cb613
+  metadata.gz: 5102bd01df0a350e928e8c4873716f75e100ec1cfe08eb21b0384e0a2c33c2e4
+  data.tar.gz: 01f59d9e6b1a28dc28e23fe40f3edc9843254720fe7667ec27fcf4acae16b469
 SHA512:
-  metadata.gz: cdd7394f5c64f710b15596e52aaf591fb4189b6c3aee51980d22af66ee28fd27cdc5061d48640f51f2de477dbec25c74c2699e0ad6348f4e72dacf0dc9b069d5
-  data.tar.gz: 58f4534abb3f2ac8b65231202a01701a6d3b1b7eca7c4605bece95777680c31f22951d99053d5806938b57f28173a202d2bf5bce1b9d2c16af1d77ea56f045eb
+  metadata.gz: 3f291b31b62fc0b2569452bfc69aace985513d8d9bf3216e26f87ed48efd6819aefb066e4ec3dd950dccccac021ecd86aed9cf955d1dde42465345f4851b9d31
+  data.tar.gz: 42a8007add11319de3bc397ba758da370734ac6cc27d18e1a7d1e047afbe1456da1ed8758856da0d9221e644a40678a6877fd37bf7ac0873ba46e1b2f54f68a9

data/lib/soql_builder.rb

@@ -6,47 +6,58 @@ class SoqlBuilder
   }.freeze
 
   def initialize(type:)
-    @query = []
-    add_to_query(TYPES[type])
+    @query = {
+      type: TYPES[type],
+      fields: [],
+      subquery: {
+        object_table: '',
+        fields: []
+      },
+      object_table: '',
+      where: '',
+    }
   end
 
   def query
-    @query.clone.join(' ')
+    structure_query
   end
 
   def fields(fields = [])
-    add_to_query(structure_fields(fields))
+    @query[:fields] = fields
     self
   end
 
-  def add_child_lookup(child:, fields: [])
-    subquery = ', (select '
-    subquery += structure_fields(fields).join(' ')
-    subquery += " from #{child})"
-    add_to_query(subquery)
+  def add_subquery(table:, fields: [])
+    @query[:subquery][:object_table] = table
+    @query[:subquery][:fields] = fields
     self
   end
 
   def from(table)
-    add_to_query('from ' + table)
+    @query[:object_table] = table
     self
   end
 
-  def where(query)
-    add_to_query('where ' + query)
+  def where(where_condition)
+    @query[:where] = where_condition
     self
   end
 
   private
 
-  def add_to_query(partial_query)
-    @query << partial_query
+  def structure_query
+    qs = @query[:type]
+    qs += " #{structure_fields(@query[:fields])}" unless @query[:fields].empty?
+    qs += ", (select #{ structure_fields(@query[:subquery][:fields]) } from #{ @query[:subquery][:object_table] })" unless @query[:subquery][:fields].empty?
+    qs += " from #{@query[:object_table]}"
+    qs += " where #{@query[:where]}" unless @query[:where] == ''
+    qs
   end
 
   def structure_fields(fields)
     fields.map.with_index do |field, index|
       field << ',' unless fields.length - 1 == index
       field
-    end
+    end.join(' ')
   end
 end

metadata

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