simple-sql 0.5.30 → 0.5.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4df3c3c433daf56581fb5120228b52b17f7c008e92580443fa0a71c9825092b6
-  data.tar.gz: e7df0fe593ca46a2d8ad317288e88e8a3d016cb5ca0f903b2c8ee07864517c0f
+  metadata.gz: 7490b50fc301d6e1a8c424e46a21f4a5cb97767ca2a99c7bdeed94b7c499a0d6
+  data.tar.gz: 3e1ec456a008d2abee6260b84beb1c17ca4b5934c1b934f00298ad6263b0f849
 SHA512:
-  metadata.gz: 2f2fa917d404f44f6f58ecdda70d512cd1a0610fcbfbde9a73aef4cf5f60a42a1df33168053f130370822128d0836901a6786d44fa68a780d416583b15ee3a54
-  data.tar.gz: 5ab5429b72e22ffe4b2f3441747e84032e400b55680bb0975cf5f6938fbcde82243799c069af52d4e19a26fc35d8bc7bbafe8352590c20359ee66e57841973af
+  metadata.gz: 5c4ff2ac25d314393ff79a5f8ff3171508b05f30a99f37d1681a5b4af0fe3f07f247623321e235fc70de4d384d8e994935fc69eaf592c41b8459ceb0c875adf7
+  data.tar.gz: e59f00c7d6a3f00d1f4c2ca101985e8a01b453cc80b774f5f95b867eebea3e1dddf70a341fd4bf8904e497b19738d58e2a66d20a08372a138bf2302d918af1cb

data/VERSION

@@ -1 +1 @@
-0.5.30
+0.5.31

data/config/database.yml

@@ -2,7 +2,8 @@ defaults: &defaults
   adapter: postgresql
   encoding: utf8
   host: '127.0.0.1'
-  # username: postgres
+  username: admin
+  password: admin
   pool: 5
   timeout: 5000
 

data/lib/simple/sql/connection/scope.rb

@@ -84,6 +84,7 @@ class Simple::SQL::Connection::Scope
     dupe.instance_variable_set :@page, @page
     dupe.instance_variable_set :@order_by_fragment, @order_by_fragment
     dupe.instance_variable_set :@limit, @limit
+    dupe.instance_variable_set :@offset, @offset
     dupe
   end
 

data/lib/simple/sql/connection/scope/order.rb

@@ -3,8 +3,16 @@ class Simple::SQL::Connection::Scope
     duplicate.send(:order_by!, sql_fragment)
   end
 
-  def limit(count)
-    duplicate.send(:limit!, count)
+  def limit(limit)
+    raise ArgumentError, "limit must be >= 0" unless limit >= 0
+
+    duplicate.send(:limit!, limit)
+  end
+
+  def offset(offset)
+    raise ArgumentError, "offset must be >= 0" unless offset >= 0
+
+    duplicate.send(:offset!, offset)
   end
 
   private
@@ -21,10 +29,16 @@ class Simple::SQL::Connection::Scope
     self
   end
 
+  def offset!(offset)
+    @offset = offset
+    self
+  end
+
   # called from to_sql
   def apply_order_and_limit(sql)
     sql = "#{sql} ORDER BY #{@order_by_fragment}" if @order_by_fragment
     sql = "#{sql} LIMIT #{@limit}" if @limit
+    sql = "#{sql} OFFSET #{@offset}" if @offset
 
     sql
   end

data/lib/simple/sql/connection/scope/pagination.rb

@@ -3,6 +3,9 @@
 class Simple::SQL::Connection::Scope
   # Set pagination
   def paginate(per:, page:)
+    raise ArgumentError, "per must be > 0" unless per > 0
+    raise ArgumentError, "page must be > 0" unless page > 0
+
     duplicate.send(:paginate!, per: per, page: page)
   end
 
@@ -23,8 +26,7 @@ class Simple::SQL::Connection::Scope
   def apply_pagination(sql, pagination:)
     return sql unless pagination == :auto && @per && @page
 
-    raise ArgumentError, "per must be > 0" unless @per > 0
-    raise ArgumentError, "page must be > 0" unless @page > 0
+    raise ArgumentError, "You cannot mix 'paginate' and 'offset'/'limit'" if @offset || @limit
 
     "#{sql} LIMIT #{@per} OFFSET #{(@page - 1) * @per}"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.30
+  version: 0.5.31
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser