soql_builder 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f39b0685480107f7c3d34354068d72ba15692386577f25b915e3f28e2de4f4f7
-  data.tar.gz: 7263ee8cacd3e668f4d3a24610b752c1f8febda5ca92dc49fe354fe3db875ac1
+  metadata.gz: d69897011cdeac19a7e60a65f656293e2583babdaeb03949e51e4e8b8ae20476
+  data.tar.gz: 42a1f2edf13a64631c6ada685688743c6997d8c69f63e0afd77258df00cbc43a
 SHA512:
-  metadata.gz: 4839627d81a29083c1652c5719c5d12fecd6f779ea610578a9632435d248b17acc6c54d0889c6cab21a583c7ebf64d0de5528940d108de85ba6adfc8ddd8dfad
-  data.tar.gz: 274be243536bb5a2610765ce097fa901947d7aed44022223460eb3038e85c6905f7bef159c2c1abac8223c4fe02a75dadb3b23f7310b0f06b77df6c53ffa34d4
+  metadata.gz: 01a964d1cb4137e711f14acea022cb15f5fbbc7ad53077d7ae36b2bff2f15a7fea202e34e78905a2bf61e4dcd86e3aa31a431d767147221cf3ab4f63958a8671
+  data.tar.gz: b13b9640f132ff219bf4fcde0b7034506f3168a394c6c485094d107a140dcd7b70401e66f35143403d07b1fa8672fa802663b69b843990d87d9e4aad5b487331

data/lib/soql_builder.rb

@@ -1,60 +1,39 @@
 # frozen_string_literal: true
 
+require_relative './soql/query'
+
 class SoqlBuilder
-  TYPES = {
-    select: 'select'
-  }.freeze
-
-  def initialize(type:)
-    @query = {
-      type: TYPES[type],
-      fields: [],
-      subquery: {
-        object_table: '',
-        fields: []
-      },
-      object_table: '',
-      where: '',
-    }
+  def initialize(type:, query: nil)
+    @query = query || Soql::Query.new
+    @query.type = type
   end
 
   def query
-    structure_query
+    @query.structure_query
   end
 
   def fields(fields = [])
-    @query[:fields] = fields
+    @query.fields = fields
     self
   end
 
   def add_subquery(table:, fields: [])
-    @query[:subquery][:object_table] = table
-    @query[:subquery][:fields] = fields
+    @query.subquery[:object_table] = table
+    @query.subquery[:fields] = fields
     self
   end
 
   def from(table)
-    @query[:object_table] = table
+    @query.object_table = table
     self
   end
 
   def where(where_condition)
-    @query[:where] = where_condition
+    @query.where = where_condition
     self
   end
 
-  private
-
-  def structure_query
-    qs = @query[:type]
-    qs += " #{join_fields(@query[:fields])}" unless @query[:fields].empty?
-    qs += ", (select #{ join_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 join_fields(fields)
-    fields.join(', ')
+  def limit(limit_number)
+    @query.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.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Alex Avlonitis