edge 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6a7e89e268d6a04bcb12ea49f331c0492a12c0
-  data.tar.gz: d3223c0995b78bc3c9de539948b225ee2c0a148a
+  metadata.gz: cbe295739f4d8428d51ab51caaf1ea299388ff1a
+  data.tar.gz: 05b0a917146b57191b1a0accc561a90ee457df38
 SHA512:
-  metadata.gz: e906301864501743b6848b67a40b33d60e5447c7a34c39023327d577e03e43b0ad926834435c31dbaa5b924f16a1b4dcf3bf095565d18779d8cd180b9b4e3776
-  data.tar.gz: 85d2f8ea8e2e95dd163f17a2e436cec52b50bb80cc8bda6afc012cedba282548cd23991ea0bb4917b91847832ea9a7fb51734ff9a34bfc1b4a5df9011cd1f115
+  metadata.gz: ad2b80707a647c3dadf1bb06b60ca5f4b002b56f5ac9577cbed2c353ab2a08fcf6fa3042999ae07958cc06b6c11a67cd5b2c66ebce5783bbd9336282ee8d235e
+  data.tar.gz: 46942d09d2066d6bf901146d3d8d86eb38d341aaa598c77cd57758a5538278e5159f992e62e9981769ccbf16e8bbd809874c1f9c2abdfd1f53e24f0be724ae1b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.4 (January 29, 2016)
+
+* Fix JRuby compatibility (jackc)
+
 # 0.4.3 (October 23, 2015)
 
 * Allow dependent option to acts_as_forest (WANG QUANG)

data/lib/edge/forest.rb

@@ -53,7 +53,18 @@ module Edge
         manager.order(forest_order) if forest_order
 
         bind_values = current_scope ? current_scope.bind_values : []
-        records = find_by_sql manager.to_sql, bind_values
+
+        # This is a nasty hack to work around
+        # https://github.com/jackc/edge/issues/14 The MRI pg gem and the JRuby
+        # activerecord-jdbcpostgresql-adapter gem bind values into the prepared
+        # statement at different times. If the binds are still '?' then the bind
+        # isn't processed yet. But if it is '$1', '$2', etc. then is has been
+        # processed. This determines how we pass the values to find_by_sql.
+        records = if connection.respond_to? :jdbc_connection_class
+          find_by_sql [manager.to_sql, bind_values.map(&:last)]
+        else
+          find_by_sql manager.to_sql, bind_values
+        end
 
         records_by_id = records.each_with_object({}) { |r, h| h[r.id] = r }
 

data/lib/edge/version.rb

@@ -1,3 +1,3 @@
 module Edge
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Graph functionality for ActiveRecord. Provides tree/forest modeling structure