simple_query 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa6c4c630a5cd486970ce4ca43b444f082050924305cb20e835a861b32676275
-  data.tar.gz: de8f1cc3758f4a65edbc4a1d4bbe1c5edde866d6016332d5b415c35d97423e7e
+  metadata.gz: 6aeb71d493d14743e43b8c9a37eed697f131db105ffc4dc0fa35dd0dd189255b
+  data.tar.gz: 82b1815e569f24a4c4da9e4cd727d95ad6c938403bd2b781eccfc39398cb264b
 SHA512:
-  metadata.gz: c9fb69f0d5505926239e5dcc396dedb098f974b38a0a1d135ddeb50927de9b88b8dc0f0fb850a2ab2fe6b9e7ba9a4955738c36d4a1c0f974e507740fa00edb15
-  data.tar.gz: e8acc149f25a8b898a04ec7ca5203f98898d88bff334700ff5e4b6e0bb538b56fb47edd0b92cb66fbd86ac89c3f98d7c48930f25e9870bb34208b0bbd2735c4f
+  metadata.gz: d422a6a3484d4242b6666bb6536f4828b666c0f16dd6a0c42104b12e3f077bd30e580dc9cf5eb4292ecbb1cd0eda218aabe29af6e221a86c3291fc116b62b856
+  data.tar.gz: cf6e7c8a7e198d1b5376053237d7bdfac59819e07571adb5656e859de9a3bb840dace69e2e600703b14a5ff01bfedbf448d1aadb471a3875874c7d390599878a

data/README.md

@@ -54,11 +54,12 @@ User.simple_query.select(:name, :email).where(active: true).execute
 ```
 
 Query with join
+
+SimpleQuery now supports **all major SQL join types** — including LEFT, RIGHT, and FULL — through the following DSL methods:
 ```ruby
 User.simple_query
-    .select(:name, :email)
-    .join(:users, :companies, foreign_key: :user_id, primary_key: :id)
-    .where(Company.arel_table[:name].eq("TechCorp"))
+    .left_join(:users, :companies, foreign_key: :user_id, primary_key: :id)
+    .select("users.name", "companies.name")
     .execute
 ```
 
@@ -143,9 +144,13 @@ class User < ActiveRecord::Base
     where(admin: true)
   end
 
+  # Block-based scope with parameter
   simple_scope :by_name do |name|
     where(name: name)
   end
+
+  # Lambda-based scope with parameter
+  simple_scope :by_name, ->(name) { where(name: name) }
 end
 ```
 You can then chain these scopes seamlessly with the normal SimpleQuery DSL:

data/lib/simple_query/builder.rb

@@ -34,12 +34,24 @@ module SimpleQuery
       self
     end
 
-    def join(table1, table2, foreign_key:, primary_key:)
-      @joins.add(table1, table2, foreign_key: foreign_key, primary_key: primary_key)
+    def join(table1, table2, foreign_key:, primary_key:, type: :inner)
+      @joins.add(table1, table2, foreign_key: foreign_key, primary_key: primary_key, join_type: type)
       reset_query
       self
     end
 
+    def left_join(table1, table2, foreign_key:, primary_key:)
+      join(table1, table2, foreign_key: foreign_key, primary_key: primary_key, type: :left)
+    end
+
+    def right_join(table1, table2, foreign_key:, primary_key:)
+      join(table1, table2, foreign_key: foreign_key, primary_key: primary_key, type: :right)
+    end
+
+    def full_join(table1, table2, foreign_key:, primary_key:)
+      join(table1, table2, foreign_key: foreign_key, primary_key: primary_key, type: :full)
+    end
+
     def order(order_conditions)
       @orders.add(order_conditions)
       reset_query

data/lib/simple_query/clauses/join_clause.rb

@@ -8,20 +8,37 @@ module SimpleQuery
       @joins = []
     end
 
-    def add(table1, table2, foreign_key:, primary_key:)
+    def add(table1, table2, foreign_key:, primary_key:, join_type: :inner)
       @joins << {
         table1: to_arel_table(table1),
         table2: to_arel_table(table2),
         foreign_key: foreign_key,
-        primary_key: primary_key
+        primary_key: primary_key,
+        type: join_type
       }
     end
 
     def apply_to(query)
-      @joins.each do |join|
-        query.join(join[:table2])
-             .on(join[:table2][join[:foreign_key]]
-                   .eq(join[:table1][join[:primary_key]]))
+      @joins.each do |join_def|
+        table1 = join_def[:table1]
+        table2 = join_def[:table2]
+        fk = join_def[:foreign_key]
+        pk = join_def[:primary_key]
+        type = join_def[:type]
+
+        join_class = case type
+                     when :left
+                       Arel::Nodes::OuterJoin
+                     when :right
+                       Arel::Nodes::RightOuterJoin
+                     when :full
+                       Arel::Nodes::FullOuterJoin
+                     else
+                       Arel::Nodes::InnerJoin
+                     end
+
+        condition = table2[fk].eq(table1[pk])
+        query.join(table2, join_class).on(condition)
       end
       query
     end

data/lib/simple_query/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleQuery
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/simple_query.rb

@@ -41,19 +41,13 @@ module SimpleQuery
       @_simple_scopes ||= {}
     end
 
-    # A reusable scope that can be applied to a SimpleQuery::Builder instance
-    # Example:
-    #   simple_scope :active do
-    #     where(active: true)
-    #   end
-    #
-    # Parameterized scope:
-    #   simple_scope :by_name do |name|
-    #     where(name: name)
-    #   end
-    #
-    def simple_scope(name, &block)
-      _simple_scopes[name.to_sym] = block
+    def simple_scope(name, body = nil, &block)
+      raise ArgumentError, "Pass either a proc/lambda or a block, not both" if body && block_given?
+
+      scope_body = body || block
+      raise ArgumentError, "You must provide a block or a proc" unless scope_body
+
+      _simple_scopes[name.to_sym] = scope_body
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_query
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Alex Kholodniak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-27 00:00:00.000000000 Z
+date: 2025-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord