rebel 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a6bda775ef068182b94b7fc45d11481a72d0977
-  data.tar.gz: d238329117454f93ebf1f415b6313bae5704401f
+  metadata.gz: 4183b987662f827d6b32d29a8ab27c296dacdb82
+  data.tar.gz: 3835ab7325bb2262aa2433be7056265ed6adc0b5
 SHA512:
-  metadata.gz: 6e3279d93fccf6c072aefe3941bfb13ae7e6b233513cdaa1bf1a6fd631ae5994d94a2a454f323b082b056fd24b921b0baaf98b6bb4268bf1c50053448c2c73d7
-  data.tar.gz: 7a4b3297ed93d07eaed0bcfc316cda2e5d8418270c218aee2f4e9e9c7e5227959adf93b5ad3ae3fefa5b585171fcd69b1b5557b3bb8d728ed6a7649dfa39ecdb
+  metadata.gz: 9586ef0f6aca3e96c5283817d8b61ad54d24f90a9018817eeca1223041a3a31e36c428919172a16c79e318c767f00e12f510d23483e778ec53da1431d9849e73
+  data.tar.gz: f3f8eebeefaf6614e02f35b61a20475083ee77037b8f6169732cb49323a11bce9c3f91b4b5695e571c4df049ce55216097f823392d4f1e91e2b64314919945d8

data/lib/rebel/sql.rb

@@ -13,13 +13,18 @@ module Rebel::SQL
     exec(Rebel::SQL.drop_table(table_name))
   end
 
-  def select(*fields, from: nil, where: nil, inner: nil, left: nil, right: nil)
+  def select(*fields, distinct: distinct, from: nil, where: nil, inner: nil, left: nil, right: nil, group: nil, order: nil, limit: nil, offset: nil)
     exec(Rebel::SQL.select(*fields,
+                           distinct: distinct,
                            from: from,
                            where: where,
                            inner: inner,
                            left: left,
-                           right: right))
+                           right: right,
+                           group: group,
+                           order: order,
+                           limit: limit,
+                           offset: offset))
   end
 
   def insert_into(table_name, *rows)
@@ -85,6 +90,18 @@ module Rebel::SQL
       clause.any? ? on(*clause) : self
     end
 
+    def having(*clause)
+      Raw.new(self + " HAVING #{Rebel::SQL.and_clause(*clause)}")
+    end
+
+    def asc
+      Raw.new(self + " ASC")
+    end
+
+    def desc
+      Raw.new(self + " DESC")
+    end
+
     def and(*clause)
       Raw.new("#{self.parens?} AND #{Rebel::SQL.and_clause(*clause)}")
     end
@@ -178,13 +195,17 @@ module Rebel::SQL
       SQL
     end
 
-    def select(*fields, from: nil, where: nil, inner: nil, left: nil, right: nil)
+    def select(*fields, distinct: nil, from: nil, where: nil, inner: nil, left: nil, right: nil, group: nil, order: nil, limit: nil, offset: nil)
       raw <<-SQL
-      SELECT #{names(*fields)} FROM #{name(from)}
+      SELECT #{distinct ? "DISTINCT #{names(*distinct)}" : names(*fields)}
+      #{from?(from)}
       #{inner?(inner)}
       #{left?(left)}
       #{right?(right)}
       #{where?(where)}
+      #{group?(group)}
+      #{order?(order)}
+      #{limit?(limit, offset)}
       SQL
     end
 
@@ -231,6 +252,10 @@ module Rebel::SQL
     end
     alias fn function
 
+    def by(*n)
+      raw("BY #{names(*n)}")
+    end
+
     def count(*n)
       raw("COUNT(#{names(*n)})")
     end
@@ -284,7 +309,7 @@ module Rebel::SQL
       when TrueClass, FalseClass then raw(v ? 'TRUE' : 'FALSE')
       when Date, Time, DateTime then value(v.iso8601)
       when nil then raw 'NULL'
-      else raise NotImplementedError, v.inspect
+      else raise NotImplementedError, "#{v.class}: #{v.inspect}"
       end
     end
 
@@ -329,6 +354,10 @@ module Rebel::SQL
       end.join(' AND ')
     end
 
+    def from?(from)
+      from ? "FROM #{name(from)}" : nil
+    end
+
     def where?(*clause)
       clause.any? ? "WHERE #{and_clause(*clause)}" : nil
     end
@@ -344,5 +373,17 @@ module Rebel::SQL
     def right?(join)
       join ? "RIGHT #{join}" : nil
     end
+
+    def group?(group)
+      group ? "GROUP #{name(group)}" : nil
+    end
+
+    def order?(order)
+      order ? "ORDER #{name(order)}" : nil
+    end
+
+    def limit?(limit, offset)
+      limit ? "LIMIT #{value(limit)}" << (offset ? " OFFSET #{offset}" : "") : nil
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rebel
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Loic Nageleisen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies: []
 description: SQL-flavoured Ruby, or is it the other way around?
 email: loic.nageleisen@gmail.com