wowsql-sdk 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad880e2257d4f66eb09d166676bb673d10fdc77d40e8649d9d21dd752c5b116d
-  data.tar.gz: f592669e6b04a84cee0c541447d1f7124e114386647c608c940af69b6c6fbe8b
+  metadata.gz: fea41521e87c3c13e013565585a0a6b28b08fc513a06ed322655882ffe06067e
+  data.tar.gz: 5e786bf298711641ef85070bdcf9a4809553bbeec58dbc23af95a36ead37b4d4
 SHA512:
-  metadata.gz: 980b656e45ad73330ce5b87e6405013b00bc38a60a7d55ff33612c0157ae599a10721480cf018ba21903740e07c5d178d2b28b39591ea16704896fe39a3de258
-  data.tar.gz: a621bd63b4f1c0c803dd5bf27216968aaba137b24d25a23473e290ca445eb4f9f24e50d72cfa8bf5cba442e03aa76be62add3d8e07d3177cc010d0ae0a3035c6
+  metadata.gz: 87bf0a5a1f4b5498b186bc6786153e249ca66b1b5788f18a3055c35c02f9edc7a8820560b57dc0c569b3cbf966943394150b3f4e3a5afed363c53ea22051c8cf
+  data.tar.gz: 69ca7517b578825d126b16e02cf78e2a7aff73a2d17393ee8b596668c1d21bb8c8dce3a8f80d49438e01b717d306c2a79e918c02b7b31fecfd83621b170ebe83

data/lib/wowsql/query_builder.rb

@@ -5,14 +5,15 @@ module WOWSQL
       @client = client
       @table_name = table_name
       @params = {}
+      @select_columns = nil
+      @filters = []
+      @group_by = nil
+      @having = []
+      @order_items = nil
     end
 
     def select(*columns)
-      if columns.length == 1 && columns[0] == '*'
-        @params['select'] = '*'
-      else
-        @params['select'] = columns.join(',')
-      end
+      @select_columns = columns
       self
     end
 
@@ -52,7 +53,47 @@ module WOWSQL
     end
 
     def is_null(column)
-      add_filter(column, 'is', nil)
+      @filters << { column: column, operator: 'is', value: nil, logical_op: 'AND' }
+      self
+    end
+
+    def in(column, values)
+      @filters << { column: column, operator: 'in', value: values, logical_op: 'AND' }
+      self
+    end
+
+    def not_in(column, values)
+      @filters << { column: column, operator: 'not_in', value: values, logical_op: 'AND' }
+      self
+    end
+
+    def between(column, min, max)
+      @filters << { column: column, operator: 'between', value: [min, max], logical_op: 'AND' }
+      self
+    end
+
+    def not_between(column, min, max)
+      @filters << { column: column, operator: 'not_between', value: [min, max], logical_op: 'AND' }
+      self
+    end
+
+    def or(column, operator, value)
+      @filters << { column: column, operator: operator, value: value, logical_op: 'OR' }
+      self
+    end
+
+    def group_by(*columns)
+      @group_by = columns
+      self
+    end
+
+    def having(column, operator, value)
+      @having << { column: column, operator: operator, value: value }
+      self
+    end
+
+    def order_by_multiple(*items)
+      @order_items = items
       self
     end
 
@@ -73,7 +114,22 @@ module WOWSQL
     end
 
     def get
-      @client.request('GET', "/#{@table_name}", @params, nil)
+      # Check if we need POST endpoint (advanced features)
+      has_advanced_features = 
+        (@group_by && !@group_by.empty?) ||
+        !@having.empty? ||
+        (@order_items && !@order_items.empty?) ||
+        @filters.any? { |f| ['in', 'not_in', 'between', 'not_between'].include?(f[:operator]) }
+
+      if has_advanced_features
+        # Use POST endpoint for advanced queries
+        body = build_query_body
+        @client.request('POST', "/#{@table_name}/query", nil, body)
+      else
+        # Use GET endpoint for simple queries (backward compatibility)
+        build_get_params
+        @client.request('GET', "/#{@table_name}", @params, nil)
+      end
     end
 
     def first
@@ -84,12 +140,49 @@ module WOWSQL
     private
 
     def add_filter(column, op, value)
-      filter_value = "#{column}.#{op}.#{value || 'null'}"
-      
-      if @params['filter']
-        @params['filter'] += ",#{filter_value}"
-      else
-        @params['filter'] = filter_value
+      @filters << { column: column, operator: op, value: value, logical_op: 'AND' }
+    end
+
+    def build_query_body
+      body = {}
+
+      body['select'] = @select_columns if @select_columns && !@select_columns.empty?
+
+      body['filters'] = @filters if !@filters.empty?
+
+      body['group_by'] = @group_by if @group_by && !@group_by.empty?
+
+      body['having'] = @having if !@having.empty?
+
+      if @order_items && !@order_items.empty?
+        body['order_by'] = @order_items.map do |item|
+          if item.is_a?(Hash)
+            item
+          else
+            { column: item[0], direction: item[1] }
+          end
+        end
+      elsif @params['order']
+        body['order_by'] = @params['order']
+        body['order_direction'] = @params['order_direction'] || 'asc'
+      end
+
+      body['limit'] = @params['limit'].to_i if @params['limit']
+      body['offset'] = @params['offset'].to_i if @params['offset']
+
+      body
+    end
+
+    def build_get_params
+      @params['select'] = @select_columns.join(',') if @select_columns && !@select_columns.empty?
+
+      simple_filters = @filters.reject { |f| ['in', 'not_in', 'between', 'not_between'].include?(f[:operator]) }
+      if !simple_filters.empty?
+        filter_strings = simple_filters.map do |f|
+          value_str = f[:value] || 'null'
+          "#{f[:column]}.#{f[:operator]}.#{value_str}"
+        end
+        @params['filter'] = filter_strings.join(',')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wowsql-sdk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - WOWSQL Team