effective_resources 2.7.17 → 2.7.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/effective/resources/relation.rb +4 -1
- data/lib/effective_resources/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ea8cb774d8092e1d120c9f5bf14600c29f62ed85e199c026574f90bc53293d84
|
|
4
|
+
data.tar.gz: fb5b45d090befa10ffa7dd289f62e25cb40b9100875b1ec9cab576af91a15131
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ff7e338aad72728753ff9c70c49aa2bcad9bb21073a2df1b208fe359dcb54c2c4f577d663a7d5430a40eefcf67359ee384200c4e238cafd5deb6d0bf8c412ed5
|
|
7
|
+
data.tar.gz: 31064f8ff830d0db9355d076b60313d6941e6df644619928e3c02d46d7e97709bdbd79557be0df5e82eb144491c3b8473d077ec16e3f9a2d065812e0e8578c23
|
|
@@ -59,9 +59,12 @@ module Effective
|
|
|
59
59
|
when :time
|
|
60
60
|
relation
|
|
61
61
|
.order(Arel.sql("EXTRACT(hour from #{sql_column}) #{sql_direction}, EXTRACT(minute from #{sql_column}) #{sql_direction}"))
|
|
62
|
-
|
|
62
|
+
when :string, :text
|
|
63
63
|
relation
|
|
64
64
|
.order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column}='' ASC, #{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
|
|
65
|
+
else
|
|
66
|
+
relation
|
|
67
|
+
.order(Arel.sql("#{sql_column} #{sql_direction}"))
|
|
65
68
|
end
|
|
66
69
|
end
|
|
67
70
|
|