order_as_specified 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69bf1783284bb4738f7c5a3d189e122d3f5f00a2
-  data.tar.gz: 6c9f53fe8658d25a1d44dc9cd120d8eda8d62537
+  metadata.gz: 450073ab184ee65a4ca822e1357d3b83ef9f77c8
+  data.tar.gz: 2b82f44edfb67e15ebd24226a1222eabf18bb008
 SHA512:
-  metadata.gz: 9f971220e0601e197de6ca6d16e5275db283f9d4c895953801220c527725242dd6a6401e94d73346555b4e0c7548893403dfc6538a91d8db9baf796db6aa13fa
-  data.tar.gz: 8f9dba4933b6c521c4a7dbfdbac6c7a23e2bd374151862ee1166ef2c916ebfa2dcf1a02975f3d51ec0abff5ca27002ec7ea5eb143546480cc3c21bdf50166777
+  metadata.gz: f8719ccfaf980a2f5bd52535700a3093d96a41f2c5194f9edc1f5862a6c37cf801d0ceeda90a7a3c8e883532ca47e3595bc0657e07cf8e9864c66044f6d6bda7
+  data.tar.gz: 26fe666d64943d02e93a78fd6edb506480c4deaa8c3a1b6a5e675c98a81fd28082008209c578313dd8acb801a9b21fbe946b7e26c7d3d3cbcc71420abbd084c1

data/.travis.yml

@@ -13,6 +13,7 @@ env:
   matrix:
     - AR_VERSION="~> 4.2.0"
     - AR_VERSION="~> 5.0.0"
+    - AR_VERSION="~> 5.1.0"
 notifications:
   email: false
   hipchat:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.3
+
+This release adds support for ActiveRecord 5.1. Many thanks to
+[cohki0305](https://github.com/cohki0305) for identifying the issue,
+[Billy Ferguson](https://github.com/fergyfresh) for investigating it, and
+especially to [Alex Heeton](https://github.com/heeton) for fixing it.
+
 # 1.2
 
 This release contains an important change: `order_as_specified` is no longer

data/lib/order_as_specified/version.rb

@@ -1,3 +1,3 @@
 module OrderAsSpecified
-  VERSION = "1.2"
+  VERSION = "1.3"
 end

data/lib/order_as_specified.rb

@@ -19,11 +19,12 @@ module OrderAsSpecified
     # We have to explicitly quote for now because SQL sanitization for ORDER BY
     # queries isn't in less current versions of Rails.
     # See: https://github.com/rails/rails/pull/13008
+    db_connection = ActiveRecord::Base.connection
     conditions = params[:values].map do |value|
       raise OrderAsSpecified::Error, "Cannot order by `nil`" if value.nil?
 
       # Sanitize each value to reduce the risk of SQL injection.
-      "#{table}.#{attribute}=#{sanitize(value)}"
+      "#{table}.#{attribute}=#{db_connection.quote(value)}"
     end
 
     scope = order(conditions.map { |cond| "#{cond} DESC" }.join(", "))

data/spec/config/test_setup_migration.rb

@@ -1,6 +1,10 @@
-class TestSetupMigration < ActiveRecord::Migration
+VersionedMigration = ActiveRecord::Migration.try(:[], 5.0) || ActiveRecord::Migration
+
+class TestSetupMigration < VersionedMigration
   def up
-    return if ActiveRecord::Base.connection.data_source_exists?(:test_classes)
+    db_connection = ActiveRecord::Base.connection
+    return if db_connection.try(:table_exists?,:test_classes) || # AR 4.2
+              db_connection.try(:data_source_exists?,:test_classes) # AR > 5.0
 
     create_table :test_classes do |t|
       t.string :field

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: order_as_specified
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord