simple-sql 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54dcb90e07a18f552fcaa0f48a29ca7e60dd3888
-  data.tar.gz: ea2093eb587de387ecff564f46f4c86857cd5e5c
+  metadata.gz: 5fcb2c111a8c6dc399a0f901c00c3bfcc03389d4
+  data.tar.gz: c49d0bed25fdeba1bda89b40ed26b750b3243e02
 SHA512:
-  metadata.gz: 35493961c28b9140d4a18508acc4d7bfe28c638fff760418173cfee3f583ba643d427ca4670eb5c4dd2d812ea7c63347b9d37bb4c82ed560d73f1651a9845199
-  data.tar.gz: 5978e812fec0928e0ff5dcf020409775c55406d20b635244a71a238a74fe094368bc02453106028d848594affbbcfde068982fb1b1a3b5db90c83e211cdc9d17
+  metadata.gz: aa83158d75e583871e008e6a7b04b29ad2c428aa4572dec3f97aebaf5a321c5d8fd0f0a50844290f618f0e49ef2317e2f8b49ac5b25602353b0e6eb93959dee7
+  data.tar.gz: 0a4b31bb554bc1db1e01bc6f52cf5bbc7d904721702e4f87d2e10458e59b0f3d6e56f9e77a2cd16e08dd34e80592ab05e61dee2a7a993339ea63f28b9a9e31b4

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'byebug'
 # Specify your gem's dependencies in {gemname}.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-sql (0.4.2)
+    simple-sql (0.4.3)
       pg (~> 0.20)
       pg_array_parser (~> 0)
 
@@ -24,6 +24,7 @@ GEM
     ast (2.3.0)
     awesome_print (0.4.0)
     builder (3.2.3)
+    byebug (10.0.2)
     concurrent-ruby (1.0.5)
     database_cleaner (1.6.2)
     diff-lcs (1.3)
@@ -78,6 +79,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 4)
   awesome_print (~> 0)
+  byebug
   database_cleaner (~> 1)
   pg (= 0.20)
   rake (~> 11)

data/lib/simple/sql/connection_adapter.rb

@@ -60,15 +60,17 @@ module Simple::SQL::ConnectionAdapter
     end
   end
 
+  private
+
   def add_page_info(scope, results)
     raise ArgumentError, "expect Array but get a #{results.class.name}" unless results.is_a?(Array)
     raise ArgumentError, "per must be > 0" unless scope.per > 0
 
     # optimization: add empty case (page <= 1 && results.empty?)
     if scope.page <= 1 && results.empty?
-      Scope::PageInfo.attach(results, total_count: 0, per: scope.per, page: scope.page)
+      Scope::PageInfo.attach(results, total_count: 0, per: scope.per, page: 1)
     else
-      sql = "SELECT COUNT(*) FROM (#{scope.to_sql(pagination: false)}) simple_sql_count"
+      sql = "SELECT COUNT(*) FROM (#{scope.order_by(nil).to_sql(pagination: false)}) simple_sql_count"
       total_count = ask(sql, *scope.args)
       Scope::PageInfo.attach(results, total_count: total_count, per: scope.per, page: scope.page)
     end
@@ -104,6 +106,8 @@ module Simple::SQL::ConnectionAdapter
     end
   end
 
+  public
+
   def resolve_type(ftype, fmod)
     @resolved_types ||= {}
     @resolved_types[[ftype, fmod]] ||= raw_connection.exec("SELECT format_type($1,$2)", [ftype, fmod]).getvalue(0, 0)

data/lib/simple/sql/scope.rb

@@ -14,12 +14,14 @@ class Simple::SQL::Scope
 
   attr_reader :args
   attr_reader :per, :page
+  attr_reader :order_by_fragment
 
   # Build a scope object
   def initialize(sql)
     @sql = sql
     @args = []
     @filters = []
+    @order_by = nil
   end
 
   private
@@ -30,6 +32,7 @@ class Simple::SQL::Scope
     dupe.instance_variable_set :@filters, @filters.dup
     dupe.instance_variable_set :@per, @per
     dupe.instance_variable_set :@page, @page
+    dupe.instance_variable_set :@order_by_fragment, @order_by_fragment
     dupe
   end
 
@@ -49,8 +52,6 @@ class Simple::SQL::Scope
     duplicate.send(:where!, sql_fragment, arg, placeholder: placeholder)
   end
 
-  private
-
   def where!(sql_fragment, arg = :__dummy__no__arg, placeholder: "?")
     if arg == :__dummy__no__arg
       @filters << sql_fragment
@@ -62,15 +63,11 @@ class Simple::SQL::Scope
     self
   end
 
-  public
-
   # Set pagination
   def paginate(per:, page:)
     duplicate.send(:paginate!, per: per, page: page)
   end
 
-  private
-
   def paginate!(per:, page:)
     @per = per
     @page = page
@@ -78,6 +75,16 @@ class Simple::SQL::Scope
     self
   end
 
+  # Adjust sort order
+  def order_by!(sql_fragment)
+    @order_by_fragment = sql_fragment
+    self
+  end
+
+  def order_by(sql_fragment)
+    duplicate.order_by!(sql_fragment)
+  end
+
   public
 
   # Is this a paginated scope?
@@ -94,11 +101,16 @@ class Simple::SQL::Scope
     unless active_filters.empty?
       sql += " WHERE (" + active_filters.join(") AND (") + ")"
     end
+
+    if order_by_fragment
+      sql += " ORDER BY #{order_by_fragment}"
+    end
+
     if pagination == :auto && @per && @page
       raise ArgumentError, "per must be > 0" unless @per > 0
       raise ArgumentError, "page must be > 0" unless @page > 0
 
-      sql += "LIMIT #{@per} OFFSET #{(@page - 1) * @per}"
+      sql += " LIMIT #{@per} OFFSET #{(@page - 1) * @per}"
     end
 
     sql

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser