find_with_order 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3024d02ad143449be88b240808017c7ab38500b3
-  data.tar.gz: d65519466c2eee4e8cd41e3d887d8368c5af9e67
+  metadata.gz: aec05deede53b157157aebfd7a0b5db7708c71ac
+  data.tar.gz: 210967754d0af4fd368cb9105583a349a17fe51c
 SHA512:
-  metadata.gz: 26c9c3b58f458a24bd87c90d4caa869aa9c09f28f26dd1409dd22a877b105f2aab24f413dc95d09931bc064aa89e9e97f1074d0839f2569934972187c36aed50
-  data.tar.gz: 9d16130c3d37aa9f69eaabd2e61684392cca820a7708bc75a0d9043a24cca3e382c70211385d8618e5e2acd60cad5e7c56e3b97b4ba7b1e5f7a3147b090eafa2
+  metadata.gz: dfcc2f505f41164453f9db0cb0992391c5bcdae7f785b3f23a71f0eecbc2c0325ce7929ad39fe08448f3f5b0258316be77b97ca8ab57493eae8cd80e0a73b4ce
+  data.tar.gz: 34f1b9bf4ca9d69f42fe34730e5a434f2e5e003521fb1fbdc27988cf682a643c38cc6a923133d58054d6a75481b309cb504184a7f1ca9d32f52ccaf9c8199da4

data/lib/find_with_order/mysql_support.rb

@@ -11,6 +11,11 @@ module FindWithOrder::MysqlSupport
     end
 
     def with_order(relation, column, ids, null_first: false)
+      if column.is_a?(Symbol) and relation.column_names.include?(column.to_s)
+        column = "#{relation.connection.quote_table_name(relation.table_name)}.#{relation.connection.quote_column_name(column)}"
+      else
+        column = column.to_s
+      end
       return relation.order("field(#{column}, #{ids.map(&:inspect).join(',')})") if null_first 
       return relation.order("field(#{column}, #{ids.reverse.map(&:inspect).join(',')}) DESC")
     end

data/lib/find_with_order/pg_support.rb

@@ -12,6 +12,11 @@ module FindWithOrder::PGSupport
     end
 
     def with_order(relation, column, ids, null_first: false)
+      if column.is_a?(Symbol) and relation.column_names.include?(column.to_s)
+        column = "#{relation.connection.quote_table_name(relation.table_name)}.#{relation.connection.quote_column_name(column)}"
+      else
+        column = column.to_s
+      end
       ids = ids.reverse if null_first
       case ids.first
       when Numeric

data/lib/find_with_order/version.rb

@@ -1,3 +1,3 @@
 module FindWithOrder
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: find_with_order
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A simple way to find records in the same order of input array.